Renamed files in client/battle to match new names of classes

client/CMakeLists.txt

@@ -2,19 +2,19 @@ set(client_SRCS
 		StdInc.cpp
 		../CCallback.cpp
 
-		battle/CBattleActionsController.cpp
+		battle/BattleActionsController.cpp
-		battle/CBattleAnimations.cpp
+		battle/BattleAnimationClasses.cpp
-		battle/CBattleControlPanel.cpp
+		battle/BattleControlPanel.cpp
-		battle/CBattleEffectsController.cpp
+		battle/BattleEffectsController.cpp
-		battle/CBattleFieldController.cpp
+		battle/BattleFieldController.cpp
-		battle/CBattleInterfaceClasses.cpp
+		battle/BattleInterfaceClasses.cpp
-		battle/CBattleInterface.cpp
+		battle/BattleInterface.cpp
-		battle/CBattleObstacleController.cpp
+		battle/BattleObstacleController.cpp
-		battle/CBattleProjectileController.cpp
+		battle/BattleProjectileController.cpp
-		battle/CBattleRenderer.cpp
+		battle/BattleRenderer.cpp
-		battle/CBattleSiegeController.cpp
+		battle/BattleSiegeController.cpp
-		battle/CBattleStacksController.cpp
+		battle/BattleStacksController.cpp
-		battle/CCreatureAnimation.cpp
+		battle/CreatureAnimation.cpp
 
 		gui/CAnimation.cpp
 		gui/CCanvas.cpp
@@ -85,19 +85,19 @@ set(client_SRCS
 set(client_HEADERS
 		StdInc.h
 
-		battle/CBattleActionsController.h
+		battle/BattleActionsController.h
-		battle/CBattleAnimations.h
+		battle/BattleAnimationClasses.h
-		battle/CBattleControlPanel.h
+		battle/BattleControlPanel.h
-		battle/CBattleEffectsController.h
+		battle/BattleEffectsController.h
-		battle/CBattleFieldController.h
+		battle/BattleFieldController.h
-		battle/CBattleInterfaceClasses.h
+		battle/BattleInterfaceClasses.h
-		battle/CBattleInterface.h
+		battle/BattleInterface.h
-		battle/CBattleObstacleController.h
+		battle/BattleObstacleController.h
-		battle/CBattleProjectileController.h
+		battle/BattleProjectileController.h
-		battle/CBattleRenderer.h
+		battle/BattleRenderer.h
-		battle/CBattleSiegeController.h
+		battle/BattleSiegeController.h
-		battle/CBattleStacksController.h
+		battle/BattleStacksController.h
-		battle/CCreatureAnimation.h
+		battle/CreatureAnimation.h
 
 		gui/CAnimation.h
 		gui/CCanvas.h

client/CPlayerInterface.cpp

@@ -12,11 +12,11 @@
 #include <vcmi/Artifact.h>
 
 #include "windows/CAdvmapInterface.h"
-#include "battle/CBattleInterface.h"
+#include "battle/BattleInterface.h"
-#include "battle/CBattleEffectsController.h"
+#include "battle/BattleEffectsController.h"
-#include "battle/CBattleFieldController.h"
+#include "battle/BattleFieldController.h"
-#include "battle/CBattleInterfaceClasses.h"
+#include "battle/BattleInterfaceClasses.h"
-#include "battle/CBattleControlPanel.h"
+#include "battle/BattleControlPanel.h"
 #include "../CCallback.h"
 #include "windows/CCastleInterface.h"
 #include "gui/CCursorHandler.h"

client/Client.cpp

@@ -42,7 +42,7 @@
 #include "mainmenu/CMainMenu.h"
 #include "mainmenu/CCampaignScreen.h"
 #include "lobby/CBonusSelection.h"
-#include "battle/CBattleInterface.h"
+#include "battle/BattleInterface.h"
 #include "../lib/CThreadHelper.h"
 #include "../lib/registerTypes/RegisterTypes.h"
 #include "gui/CGuiHandler.h"

client/NetPacksClient.cpp

@@ -30,7 +30,7 @@
 #include "windows/GUIClasses.h"
 #include "../lib/CConfigHandler.h"
 #include "gui/SDL_Extensions.h"
-#include "battle/CBattleInterface.h"
+#include "battle/BattleInterface.h"
 #include "../lib/mapping/CCampaignHandler.h"
 #include "../lib/CGameState.h"
 #include "../lib/CStack.h"

client/battle/BattleActionsController.cpp

@@ -8,14 +8,14 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleActionsController.h"
+#include "BattleActionsController.h"
 
-#include "CBattleControlPanel.h"
+#include "BattleControlPanel.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleFieldController.h"
+#include "BattleFieldController.h"
-#include "CBattleSiegeController.h"
+#include "BattleSiegeController.h"
-#include "CBattleInterfaceClasses.h"
+#include "BattleInterfaceClasses.h"
 
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"

client/battle/BattleAnimationClasses.cpp

@@ -8,18 +8,18 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleAnimations.h"
+#include "BattleAnimationClasses.h"
 
 #include <boost/math/constants/constants.hpp>
 
-#include "CBattleInterfaceClasses.h"
+#include "BattleInterfaceClasses.h"
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleProjectileController.h"
+#include "BattleProjectileController.h"
-#include "CBattleSiegeController.h"
+#include "BattleSiegeController.h"
-#include "CBattleFieldController.h"
+#include "BattleFieldController.h"
-#include "CBattleEffectsController.h"
+#include "BattleEffectsController.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CCreatureAnimation.h"
+#include "CreatureAnimation.h"
 
 #include "../CGameInfo.h"
 #include "../CMusicHandler.h"

client/battle/BattleControlPanel.cpp

@@ -8,12 +8,12 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleControlPanel.h"
+#include "BattleControlPanel.h"
 
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleInterfaceClasses.h"
+#include "BattleInterfaceClasses.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CBattleActionsController.h"
+#include "BattleActionsController.h"
 
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"

client/battle/BattleEffectsController.cpp

@@ -8,15 +8,15 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleEffectsController.h"
+#include "BattleEffectsController.h"
 
-#include "CBattleAnimations.h"
+#include "BattleAnimationClasses.h"
-#include "CBattleControlPanel.h"
+#include "BattleControlPanel.h"
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleInterfaceClasses.h"
+#include "BattleInterfaceClasses.h"
-#include "CBattleFieldController.h"
+#include "BattleFieldController.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CBattleRenderer.h"
+#include "BattleRenderer.h"
 
 #include "../CMusicHandler.h"
 #include "../CGameInfo.h"

client/battle/BattleFieldController.cpp

@@ -8,17 +8,17 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleFieldController.h"
+#include "BattleFieldController.h"
 
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleActionsController.h"
+#include "BattleActionsController.h"
-#include "CBattleInterfaceClasses.h"
+#include "BattleInterfaceClasses.h"
-#include "CBattleEffectsController.h"
+#include "BattleEffectsController.h"
-#include "CBattleSiegeController.h"
+#include "BattleSiegeController.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CBattleObstacleController.h"
+#include "BattleObstacleController.h"
-#include "CBattleProjectileController.h"
+#include "BattleProjectileController.h"
-#include "CBattleRenderer.h"
+#include "BattleRenderer.h"
 
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"

client/battle/BattleInterface.cpp

@@ -8,20 +8,20 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
 
-#include "CBattleAnimations.h"
+#include "BattleAnimationClasses.h"
-#include "CBattleActionsController.h"
+#include "BattleActionsController.h"
-#include "CBattleInterfaceClasses.h"
+#include "BattleInterfaceClasses.h"
-#include "CCreatureAnimation.h"
+#include "CreatureAnimation.h"
-#include "CBattleProjectileController.h"
+#include "BattleProjectileController.h"
-#include "CBattleEffectsController.h"
+#include "BattleEffectsController.h"
-#include "CBattleObstacleController.h"
+#include "BattleObstacleController.h"
-#include "CBattleSiegeController.h"
+#include "BattleSiegeController.h"
-#include "CBattleFieldController.h"
+#include "BattleFieldController.h"
-#include "CBattleControlPanel.h"
+#include "BattleControlPanel.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CBattleRenderer.h"
+#include "BattleRenderer.h"
 
 #include "../CGameInfo.h"
 #include "../CMessage.h"

client/battle/BattleInterfaceClasses.cpp

@@ -8,14 +8,14 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleInterfaceClasses.h"
+#include "BattleInterfaceClasses.h"
 
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleActionsController.h"
+#include "BattleActionsController.h"
-#include "CBattleSiegeController.h"
+#include "BattleSiegeController.h"
-#include "CBattleFieldController.h"
+#include "BattleFieldController.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CBattleControlPanel.h"
+#include "BattleControlPanel.h"
 
 #include "../CGameInfo.h"
 #include "../CMessage.h"

client/battle/BattleObstacleController.cpp

@@ -8,13 +8,13 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleObstacleController.h"
+#include "BattleObstacleController.h"
 
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleFieldController.h"
+#include "BattleFieldController.h"
-#include "CBattleAnimations.h"
+#include "BattleAnimationClasses.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CBattleRenderer.h"
+#include "BattleRenderer.h"
 
 #include "../CPlayerInterface.h"
 #include "../gui/CAnimation.h"

client/battle/BattleProjectileController.cpp

@@ -8,12 +8,12 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleProjectileController.h"
+#include "BattleProjectileController.h"
 
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleSiegeController.h"
+#include "BattleSiegeController.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CCreatureAnimation.h"
+#include "CreatureAnimation.h"
 
 #include "../gui/Geometries.h"
 #include "../gui/CAnimation.h"

client/battle/BattleRenderer.cpp

@@ -8,14 +8,13 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleRenderer.h"
+#include "BattleRenderer.h"
 
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-
+#include "BattleEffectsController.h"
-#include "CBattleEffectsController.h"
+#include "BattleSiegeController.h"
-#include "CBattleSiegeController.h"
+#include "BattleStacksController.h"
-#include "CBattleStacksController.h"
+#include "BattleObstacleController.h"
-#include "CBattleObstacleController.h"
 
 void BattleRenderer::collectObjects()
 {

client/battle/BattleSiegeController.cpp

@@ -8,14 +8,14 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleSiegeController.h"
+#include "BattleSiegeController.h"
 
-#include "CBattleAnimations.h"
+#include "BattleAnimationClasses.h"
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleInterfaceClasses.h"
+#include "BattleInterfaceClasses.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
-#include "CBattleFieldController.h"
+#include "BattleFieldController.h"
-#include "CBattleRenderer.h"
+#include "BattleRenderer.h"
 
 #include "../CMusicHandler.h"
 #include "../CGameInfo.h"

client/battle/BattleStacksController.cpp

@@ -8,19 +8,18 @@
  *
  */
 #include "StdInc.h"
-#include "CBattleStacksController.h"
+#include "BattleStacksController.h"
 
-#include "CBattleSiegeController.h"
+#include "BattleSiegeController.h"
-#include "CBattleInterfaceClasses.h"
+#include "BattleInterfaceClasses.h"
-#include "CBattleInterface.h"
+#include "BattleInterface.h"
-#include "CBattleAnimations.h"
+#include "BattleAnimationClasses.h"
-#include "CBattleFieldController.h"
+#include "BattleFieldController.h"
-#include "CBattleEffectsController.h"
+#include "BattleEffectsController.h"
-#include "CBattleProjectileController.h"
+#include "BattleProjectileController.h"
-#include "CBattleControlPanel.h"
+#include "BattleControlPanel.h"
-#include "CBattleRenderer.h"
+#include "BattleRenderer.h"
-
+#include "CreatureAnimation.h"
-#include "CCreatureAnimation.h"
 
 #include "../CPlayerInterface.h"
 #include "../CMusicHandler.h"

client/battle/CreatureAnimation.cpp

@@ -8,7 +8,7 @@
  *
  */
 #include "StdInc.h"
-#include "CCreatureAnimation.h"
+#include "CreatureAnimation.h"
 
 #include "../../lib/CConfigHandler.h"
 #include "../../lib/CCreatureHandler.h"

client/gui/CGuiHandler.cpp

@@ -21,7 +21,7 @@
 #include "../../lib/CConfigHandler.h"
 #include "../CMT.h"
 #include "../CPlayerInterface.h"
-#include "../battle/CBattleInterface.h"
+#include "../battle/BattleInterface.h"
 
 extern std::queue<SDL_Event> SDLEventsQueue;
 extern boost::mutex eventsM;

client/widgets/AdventureMapClasses.cpp

@@ -31,8 +31,8 @@
 #include "../windows/CAdvmapInterface.h"
 #include "../windows/GUIClasses.h"
 
-#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/BattleInterfaceClasses.h"
-#include "../battle/CBattleInterface.h"
+#include "../battle/BattleInterface.h"
 
 #include "../../CCallback.h"
 #include "../../lib/StartInfo.h"

client/widgets/Buttons.cpp

@@ -16,8 +16,8 @@
 #include "../CMusicHandler.h"
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"
-#include "../battle/CBattleInterface.h"
+#include "../battle/BattleInterface.h"
-#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/BattleInterfaceClasses.h"
 #include "../gui/CAnimation.h"
 #include "../gui/CGuiHandler.h"
 #include "../windows/InfoWindows.h"

client/widgets/Images.cpp

@@ -17,8 +17,8 @@
 #include "../gui/CGuiHandler.h"
 #include "../gui/CCursorHandler.h"
 
-#include "../battle/CBattleInterface.h"
+#include "../battle/BattleInterface.h"
-#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/BattleInterfaceClasses.h"
 
 #include "../CBitmapHandler.h"
 #include "../Graphics.h"

client/windows/CSpellWindow.cpp

@@ -24,7 +24,7 @@
 #include "../CVideoHandler.h"
 #include "../Graphics.h"
 
-#include "../battle/CBattleInterface.h"
+#include "../battle/BattleInterface.h"
 #include "../gui/CAnimation.h"
 #include "../gui/CGuiHandler.h"
 #include "../gui/SDL_Extensions.h"

client/windows/CWindowObject.cpp

@@ -20,8 +20,8 @@
 #include "../gui/CGuiHandler.h"
 #include "../gui/CCursorHandler.h"
 
-#include "../battle/CBattleInterface.h"
+#include "../battle/BattleInterface.h"
-#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/BattleInterfaceClasses.h"
 
 #include "../Graphics.h"
 #include "../CGameInfo.h"

client/windows/GUIClasses.cpp

@@ -26,8 +26,8 @@
 #include "../mapHandler.h"
 #include "../CServerHandler.h"
 
-#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/BattleInterfaceClasses.h"
-#include "../battle/CBattleInterface.h"
+#include "../battle/BattleInterface.h"
 
 #include "../gui/CAnimation.h"
 #include "../gui/CGuiHandler.h"

client/windows/InfoWindows.cpp

@@ -26,8 +26,8 @@
 #include "../gui/CGuiHandler.h"
 #include "../gui/CCursorHandler.h"
 
-#include "../battle/CBattleInterface.h"
+#include "../battle/BattleInterface.h"
-#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/BattleInterfaceClasses.h"
 
 #include "../../CCallback.h"