From c8558235282d804d0ec5e48f89bce372cd0252b2 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Fri, 9 Dec 2022 13:38:46 +0200 Subject: [PATCH] Renamed files in client/battle to match new names of classes --- client/CMakeLists.txt | 52 +++++++++---------- client/CPlayerInterface.cpp | 10 ++-- client/Client.cpp | 2 +- client/NetPacksClient.cpp | 2 +- ...roller.cpp => BattleActionsController.cpp} | 14 ++--- ...Controller.h => BattleActionsController.h} | 0 ...mations.cpp => BattleAnimationClasses.cpp} | 18 +++---- ...eAnimations.h => BattleAnimationClasses.h} | 0 ...ontrolPanel.cpp => BattleControlPanel.cpp} | 10 ++-- ...tleControlPanel.h => BattleControlPanel.h} | 0 ...roller.cpp => BattleEffectsController.cpp} | 16 +++--- ...Controller.h => BattleEffectsController.h} | 0 ...ntroller.cpp => BattleFieldController.cpp} | 20 +++---- ...ldController.h => BattleFieldController.h} | 0 ...attleInterface.cpp => BattleInterface.cpp} | 26 +++++----- .../{CBattleInterface.h => BattleInterface.h} | 0 ...Classes.cpp => BattleInterfaceClasses.cpp} | 14 ++--- ...faceClasses.h => BattleInterfaceClasses.h} | 0 ...oller.cpp => BattleObstacleController.cpp} | 12 ++--- ...ontroller.h => BattleObstacleController.h} | 0 ...ler.cpp => BattleProjectileController.cpp} | 10 ++-- ...troller.h => BattleProjectileController.h} | 0 ...CBattleRenderer.cpp => BattleRenderer.cpp} | 13 +++-- .../{CBattleRenderer.h => BattleRenderer.h} | 0 ...ntroller.cpp => BattleSiegeController.cpp} | 14 ++--- ...geController.h => BattleSiegeController.h} | 0 ...troller.cpp => BattleStacksController.cpp} | 23 ++++---- ...sController.h => BattleStacksController.h} | 0 ...ureAnimation.cpp => CreatureAnimation.cpp} | 2 +- ...reatureAnimation.h => CreatureAnimation.h} | 0 client/gui/CGuiHandler.cpp | 2 +- client/widgets/AdventureMapClasses.cpp | 4 +- client/widgets/Buttons.cpp | 4 +- client/widgets/Images.cpp | 4 +- client/windows/CSpellWindow.cpp | 2 +- client/windows/CWindowObject.cpp | 4 +- client/windows/GUIClasses.cpp | 4 +- client/windows/InfoWindows.cpp | 4 +- 38 files changed, 142 insertions(+), 144 deletions(-) rename client/battle/{CBattleActionsController.cpp => BattleActionsController.cpp} (96%) rename client/battle/{CBattleActionsController.h => BattleActionsController.h} (100%) rename client/battle/{CBattleAnimations.cpp => BattleAnimationClasses.cpp} (95%) rename client/battle/{CBattleAnimations.h => BattleAnimationClasses.h} (100%) rename client/battle/{CBattleControlPanel.cpp => BattleControlPanel.cpp} (95%) rename client/battle/{CBattleControlPanel.h => BattleControlPanel.h} (100%) rename client/battle/{CBattleEffectsController.cpp => BattleEffectsController.cpp} (90%) rename client/battle/{CBattleEffectsController.h => BattleEffectsController.h} (100%) rename client/battle/{CBattleFieldController.cpp => BattleFieldController.cpp} (95%) rename client/battle/{CBattleFieldController.h => BattleFieldController.h} (100%) rename client/battle/{CBattleInterface.cpp => BattleInterface.cpp} (94%) rename client/battle/{CBattleInterface.h => BattleInterface.h} (100%) rename client/battle/{CBattleInterfaceClasses.cpp => BattleInterfaceClasses.cpp} (96%) rename client/battle/{CBattleInterfaceClasses.h => BattleInterfaceClasses.h} (100%) rename client/battle/{CBattleObstacleController.cpp => BattleObstacleController.cpp} (93%) rename client/battle/{CBattleObstacleController.h => BattleObstacleController.h} (100%) rename client/battle/{CBattleProjectileController.cpp => BattleProjectileController.cpp} (95%) rename client/battle/{CBattleProjectileController.h => BattleProjectileController.h} (100%) rename client/battle/{CBattleRenderer.cpp => BattleRenderer.cpp} (86%) rename client/battle/{CBattleRenderer.h => BattleRenderer.h} (100%) rename client/battle/{CBattleSiegeController.cpp => BattleSiegeController.cpp} (95%) rename client/battle/{CBattleSiegeController.h => BattleSiegeController.h} (100%) rename client/battle/{CBattleStacksController.cpp => BattleStacksController.cpp} (94%) rename client/battle/{CBattleStacksController.h => BattleStacksController.h} (100%) rename client/battle/{CCreatureAnimation.cpp => CreatureAnimation.cpp} (96%) rename client/battle/{CCreatureAnimation.h => CreatureAnimation.h} (100%) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 0996c81d9..d5668dac9 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -2,19 +2,19 @@ set(client_SRCS StdInc.cpp ../CCallback.cpp - battle/CBattleActionsController.cpp - battle/CBattleAnimations.cpp - battle/CBattleControlPanel.cpp - battle/CBattleEffectsController.cpp - battle/CBattleFieldController.cpp - battle/CBattleInterfaceClasses.cpp - battle/CBattleInterface.cpp - battle/CBattleObstacleController.cpp - battle/CBattleProjectileController.cpp - battle/CBattleRenderer.cpp - battle/CBattleSiegeController.cpp - battle/CBattleStacksController.cpp - battle/CCreatureAnimation.cpp + battle/BattleActionsController.cpp + battle/BattleAnimationClasses.cpp + battle/BattleControlPanel.cpp + battle/BattleEffectsController.cpp + battle/BattleFieldController.cpp + battle/BattleInterfaceClasses.cpp + battle/BattleInterface.cpp + battle/BattleObstacleController.cpp + battle/BattleProjectileController.cpp + battle/BattleRenderer.cpp + battle/BattleSiegeController.cpp + battle/BattleStacksController.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/CBattleAnimations.h - battle/CBattleControlPanel.h - battle/CBattleEffectsController.h - battle/CBattleFieldController.h - battle/CBattleInterfaceClasses.h - battle/CBattleInterface.h - battle/CBattleObstacleController.h - battle/CBattleProjectileController.h - battle/CBattleRenderer.h - battle/CBattleSiegeController.h - battle/CBattleStacksController.h - battle/CCreatureAnimation.h + battle/BattleActionsController.h + battle/BattleAnimationClasses.h + battle/BattleControlPanel.h + battle/BattleEffectsController.h + battle/BattleFieldController.h + battle/BattleInterfaceClasses.h + battle/BattleInterface.h + battle/BattleObstacleController.h + battle/BattleProjectileController.h + battle/BattleRenderer.h + battle/BattleSiegeController.h + battle/BattleStacksController.h + battle/CreatureAnimation.h gui/CAnimation.h gui/CCanvas.h diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp index 809f747a4..f8cc83629 100644 --- a/client/CPlayerInterface.cpp +++ b/client/CPlayerInterface.cpp @@ -12,11 +12,11 @@ #include #include "windows/CAdvmapInterface.h" -#include "battle/CBattleInterface.h" -#include "battle/CBattleEffectsController.h" -#include "battle/CBattleFieldController.h" -#include "battle/CBattleInterfaceClasses.h" -#include "battle/CBattleControlPanel.h" +#include "battle/BattleInterface.h" +#include "battle/BattleEffectsController.h" +#include "battle/BattleFieldController.h" +#include "battle/BattleInterfaceClasses.h" +#include "battle/BattleControlPanel.h" #include "../CCallback.h" #include "windows/CCastleInterface.h" #include "gui/CCursorHandler.h" diff --git a/client/Client.cpp b/client/Client.cpp index c653b93cc..c1cd067ad 100644 --- a/client/Client.cpp +++ b/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" diff --git a/client/NetPacksClient.cpp b/client/NetPacksClient.cpp index f2d27ffdc..e98977797 100644 --- a/client/NetPacksClient.cpp +++ b/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" diff --git a/client/battle/CBattleActionsController.cpp b/client/battle/BattleActionsController.cpp similarity index 96% rename from client/battle/CBattleActionsController.cpp rename to client/battle/BattleActionsController.cpp index f786423c4..a26c79df7 100644 --- a/client/battle/CBattleActionsController.cpp +++ b/client/battle/BattleActionsController.cpp @@ -8,14 +8,14 @@ * */ #include "StdInc.h" -#include "CBattleActionsController.h" +#include "BattleActionsController.h" -#include "CBattleControlPanel.h" -#include "CBattleStacksController.h" -#include "CBattleInterface.h" -#include "CBattleFieldController.h" -#include "CBattleSiegeController.h" -#include "CBattleInterfaceClasses.h" +#include "BattleControlPanel.h" +#include "BattleStacksController.h" +#include "BattleInterface.h" +#include "BattleFieldController.h" +#include "BattleSiegeController.h" +#include "BattleInterfaceClasses.h" #include "../CGameInfo.h" #include "../CPlayerInterface.h" diff --git a/client/battle/CBattleActionsController.h b/client/battle/BattleActionsController.h similarity index 100% rename from client/battle/CBattleActionsController.h rename to client/battle/BattleActionsController.h diff --git a/client/battle/CBattleAnimations.cpp b/client/battle/BattleAnimationClasses.cpp similarity index 95% rename from client/battle/CBattleAnimations.cpp rename to client/battle/BattleAnimationClasses.cpp index 690f44e0d..9e7a20888 100644 --- a/client/battle/CBattleAnimations.cpp +++ b/client/battle/BattleAnimationClasses.cpp @@ -8,18 +8,18 @@ * */ #include "StdInc.h" -#include "CBattleAnimations.h" +#include "BattleAnimationClasses.h" #include -#include "CBattleInterfaceClasses.h" -#include "CBattleInterface.h" -#include "CBattleProjectileController.h" -#include "CBattleSiegeController.h" -#include "CBattleFieldController.h" -#include "CBattleEffectsController.h" -#include "CBattleStacksController.h" -#include "CCreatureAnimation.h" +#include "BattleInterfaceClasses.h" +#include "BattleInterface.h" +#include "BattleProjectileController.h" +#include "BattleSiegeController.h" +#include "BattleFieldController.h" +#include "BattleEffectsController.h" +#include "BattleStacksController.h" +#include "CreatureAnimation.h" #include "../CGameInfo.h" #include "../CMusicHandler.h" diff --git a/client/battle/CBattleAnimations.h b/client/battle/BattleAnimationClasses.h similarity index 100% rename from client/battle/CBattleAnimations.h rename to client/battle/BattleAnimationClasses.h diff --git a/client/battle/CBattleControlPanel.cpp b/client/battle/BattleControlPanel.cpp similarity index 95% rename from client/battle/CBattleControlPanel.cpp rename to client/battle/BattleControlPanel.cpp index 8dea5cbb3..dcd0a5ac0 100644 --- a/client/battle/CBattleControlPanel.cpp +++ b/client/battle/BattleControlPanel.cpp @@ -8,12 +8,12 @@ * */ #include "StdInc.h" -#include "CBattleControlPanel.h" +#include "BattleControlPanel.h" -#include "CBattleInterface.h" -#include "CBattleInterfaceClasses.h" -#include "CBattleStacksController.h" -#include "CBattleActionsController.h" +#include "BattleInterface.h" +#include "BattleInterfaceClasses.h" +#include "BattleStacksController.h" +#include "BattleActionsController.h" #include "../CGameInfo.h" #include "../CPlayerInterface.h" diff --git a/client/battle/CBattleControlPanel.h b/client/battle/BattleControlPanel.h similarity index 100% rename from client/battle/CBattleControlPanel.h rename to client/battle/BattleControlPanel.h diff --git a/client/battle/CBattleEffectsController.cpp b/client/battle/BattleEffectsController.cpp similarity index 90% rename from client/battle/CBattleEffectsController.cpp rename to client/battle/BattleEffectsController.cpp index 5f86e1bb1..6034e4955 100644 --- a/client/battle/CBattleEffectsController.cpp +++ b/client/battle/BattleEffectsController.cpp @@ -8,15 +8,15 @@ * */ #include "StdInc.h" -#include "CBattleEffectsController.h" +#include "BattleEffectsController.h" -#include "CBattleAnimations.h" -#include "CBattleControlPanel.h" -#include "CBattleInterface.h" -#include "CBattleInterfaceClasses.h" -#include "CBattleFieldController.h" -#include "CBattleStacksController.h" -#include "CBattleRenderer.h" +#include "BattleAnimationClasses.h" +#include "BattleControlPanel.h" +#include "BattleInterface.h" +#include "BattleInterfaceClasses.h" +#include "BattleFieldController.h" +#include "BattleStacksController.h" +#include "BattleRenderer.h" #include "../CMusicHandler.h" #include "../CGameInfo.h" diff --git a/client/battle/CBattleEffectsController.h b/client/battle/BattleEffectsController.h similarity index 100% rename from client/battle/CBattleEffectsController.h rename to client/battle/BattleEffectsController.h diff --git a/client/battle/CBattleFieldController.cpp b/client/battle/BattleFieldController.cpp similarity index 95% rename from client/battle/CBattleFieldController.cpp rename to client/battle/BattleFieldController.cpp index f25b67868..04a001628 100644 --- a/client/battle/CBattleFieldController.cpp +++ b/client/battle/BattleFieldController.cpp @@ -8,17 +8,17 @@ * */ #include "StdInc.h" -#include "CBattleFieldController.h" +#include "BattleFieldController.h" -#include "CBattleInterface.h" -#include "CBattleActionsController.h" -#include "CBattleInterfaceClasses.h" -#include "CBattleEffectsController.h" -#include "CBattleSiegeController.h" -#include "CBattleStacksController.h" -#include "CBattleObstacleController.h" -#include "CBattleProjectileController.h" -#include "CBattleRenderer.h" +#include "BattleInterface.h" +#include "BattleActionsController.h" +#include "BattleInterfaceClasses.h" +#include "BattleEffectsController.h" +#include "BattleSiegeController.h" +#include "BattleStacksController.h" +#include "BattleObstacleController.h" +#include "BattleProjectileController.h" +#include "BattleRenderer.h" #include "../CGameInfo.h" #include "../CPlayerInterface.h" diff --git a/client/battle/CBattleFieldController.h b/client/battle/BattleFieldController.h similarity index 100% rename from client/battle/CBattleFieldController.h rename to client/battle/BattleFieldController.h diff --git a/client/battle/CBattleInterface.cpp b/client/battle/BattleInterface.cpp similarity index 94% rename from client/battle/CBattleInterface.cpp rename to client/battle/BattleInterface.cpp index 7eba7ec4f..5f0193a45 100644 --- a/client/battle/CBattleInterface.cpp +++ b/client/battle/BattleInterface.cpp @@ -8,20 +8,20 @@ * */ #include "StdInc.h" -#include "CBattleInterface.h" +#include "BattleInterface.h" -#include "CBattleAnimations.h" -#include "CBattleActionsController.h" -#include "CBattleInterfaceClasses.h" -#include "CCreatureAnimation.h" -#include "CBattleProjectileController.h" -#include "CBattleEffectsController.h" -#include "CBattleObstacleController.h" -#include "CBattleSiegeController.h" -#include "CBattleFieldController.h" -#include "CBattleControlPanel.h" -#include "CBattleStacksController.h" -#include "CBattleRenderer.h" +#include "BattleAnimationClasses.h" +#include "BattleActionsController.h" +#include "BattleInterfaceClasses.h" +#include "CreatureAnimation.h" +#include "BattleProjectileController.h" +#include "BattleEffectsController.h" +#include "BattleObstacleController.h" +#include "BattleSiegeController.h" +#include "BattleFieldController.h" +#include "BattleControlPanel.h" +#include "BattleStacksController.h" +#include "BattleRenderer.h" #include "../CGameInfo.h" #include "../CMessage.h" diff --git a/client/battle/CBattleInterface.h b/client/battle/BattleInterface.h similarity index 100% rename from client/battle/CBattleInterface.h rename to client/battle/BattleInterface.h diff --git a/client/battle/CBattleInterfaceClasses.cpp b/client/battle/BattleInterfaceClasses.cpp similarity index 96% rename from client/battle/CBattleInterfaceClasses.cpp rename to client/battle/BattleInterfaceClasses.cpp index a67dfac62..2c1c0da9a 100644 --- a/client/battle/CBattleInterfaceClasses.cpp +++ b/client/battle/BattleInterfaceClasses.cpp @@ -8,14 +8,14 @@ * */ #include "StdInc.h" -#include "CBattleInterfaceClasses.h" +#include "BattleInterfaceClasses.h" -#include "CBattleInterface.h" -#include "CBattleActionsController.h" -#include "CBattleSiegeController.h" -#include "CBattleFieldController.h" -#include "CBattleStacksController.h" -#include "CBattleControlPanel.h" +#include "BattleInterface.h" +#include "BattleActionsController.h" +#include "BattleSiegeController.h" +#include "BattleFieldController.h" +#include "BattleStacksController.h" +#include "BattleControlPanel.h" #include "../CGameInfo.h" #include "../CMessage.h" diff --git a/client/battle/CBattleInterfaceClasses.h b/client/battle/BattleInterfaceClasses.h similarity index 100% rename from client/battle/CBattleInterfaceClasses.h rename to client/battle/BattleInterfaceClasses.h diff --git a/client/battle/CBattleObstacleController.cpp b/client/battle/BattleObstacleController.cpp similarity index 93% rename from client/battle/CBattleObstacleController.cpp rename to client/battle/BattleObstacleController.cpp index 6cb43ba61..1e0ba7e5b 100644 --- a/client/battle/CBattleObstacleController.cpp +++ b/client/battle/BattleObstacleController.cpp @@ -8,13 +8,13 @@ * */ #include "StdInc.h" -#include "CBattleObstacleController.h" +#include "BattleObstacleController.h" -#include "CBattleInterface.h" -#include "CBattleFieldController.h" -#include "CBattleAnimations.h" -#include "CBattleStacksController.h" -#include "CBattleRenderer.h" +#include "BattleInterface.h" +#include "BattleFieldController.h" +#include "BattleAnimationClasses.h" +#include "BattleStacksController.h" +#include "BattleRenderer.h" #include "../CPlayerInterface.h" #include "../gui/CAnimation.h" diff --git a/client/battle/CBattleObstacleController.h b/client/battle/BattleObstacleController.h similarity index 100% rename from client/battle/CBattleObstacleController.h rename to client/battle/BattleObstacleController.h diff --git a/client/battle/CBattleProjectileController.cpp b/client/battle/BattleProjectileController.cpp similarity index 95% rename from client/battle/CBattleProjectileController.cpp rename to client/battle/BattleProjectileController.cpp index 5cff98dc7..3fd590d53 100644 --- a/client/battle/CBattleProjectileController.cpp +++ b/client/battle/BattleProjectileController.cpp @@ -8,12 +8,12 @@ * */ #include "StdInc.h" -#include "CBattleProjectileController.h" +#include "BattleProjectileController.h" -#include "CBattleInterface.h" -#include "CBattleSiegeController.h" -#include "CBattleStacksController.h" -#include "CCreatureAnimation.h" +#include "BattleInterface.h" +#include "BattleSiegeController.h" +#include "BattleStacksController.h" +#include "CreatureAnimation.h" #include "../gui/Geometries.h" #include "../gui/CAnimation.h" diff --git a/client/battle/CBattleProjectileController.h b/client/battle/BattleProjectileController.h similarity index 100% rename from client/battle/CBattleProjectileController.h rename to client/battle/BattleProjectileController.h diff --git a/client/battle/CBattleRenderer.cpp b/client/battle/BattleRenderer.cpp similarity index 86% rename from client/battle/CBattleRenderer.cpp rename to client/battle/BattleRenderer.cpp index b773551e8..c48bae083 100644 --- a/client/battle/CBattleRenderer.cpp +++ b/client/battle/BattleRenderer.cpp @@ -8,14 +8,13 @@ * */ #include "StdInc.h" -#include "CBattleRenderer.h" +#include "BattleRenderer.h" -#include "CBattleInterface.h" - -#include "CBattleEffectsController.h" -#include "CBattleSiegeController.h" -#include "CBattleStacksController.h" -#include "CBattleObstacleController.h" +#include "BattleInterface.h" +#include "BattleEffectsController.h" +#include "BattleSiegeController.h" +#include "BattleStacksController.h" +#include "BattleObstacleController.h" void BattleRenderer::collectObjects() { diff --git a/client/battle/CBattleRenderer.h b/client/battle/BattleRenderer.h similarity index 100% rename from client/battle/CBattleRenderer.h rename to client/battle/BattleRenderer.h diff --git a/client/battle/CBattleSiegeController.cpp b/client/battle/BattleSiegeController.cpp similarity index 95% rename from client/battle/CBattleSiegeController.cpp rename to client/battle/BattleSiegeController.cpp index 7914f75c4..6f060bb2e 100644 --- a/client/battle/CBattleSiegeController.cpp +++ b/client/battle/BattleSiegeController.cpp @@ -8,14 +8,14 @@ * */ #include "StdInc.h" -#include "CBattleSiegeController.h" +#include "BattleSiegeController.h" -#include "CBattleAnimations.h" -#include "CBattleInterface.h" -#include "CBattleInterfaceClasses.h" -#include "CBattleStacksController.h" -#include "CBattleFieldController.h" -#include "CBattleRenderer.h" +#include "BattleAnimationClasses.h" +#include "BattleInterface.h" +#include "BattleInterfaceClasses.h" +#include "BattleStacksController.h" +#include "BattleFieldController.h" +#include "BattleRenderer.h" #include "../CMusicHandler.h" #include "../CGameInfo.h" diff --git a/client/battle/CBattleSiegeController.h b/client/battle/BattleSiegeController.h similarity index 100% rename from client/battle/CBattleSiegeController.h rename to client/battle/BattleSiegeController.h diff --git a/client/battle/CBattleStacksController.cpp b/client/battle/BattleStacksController.cpp similarity index 94% rename from client/battle/CBattleStacksController.cpp rename to client/battle/BattleStacksController.cpp index cbff82279..e88559db9 100644 --- a/client/battle/CBattleStacksController.cpp +++ b/client/battle/BattleStacksController.cpp @@ -8,19 +8,18 @@ * */ #include "StdInc.h" -#include "CBattleStacksController.h" +#include "BattleStacksController.h" -#include "CBattleSiegeController.h" -#include "CBattleInterfaceClasses.h" -#include "CBattleInterface.h" -#include "CBattleAnimations.h" -#include "CBattleFieldController.h" -#include "CBattleEffectsController.h" -#include "CBattleProjectileController.h" -#include "CBattleControlPanel.h" -#include "CBattleRenderer.h" - -#include "CCreatureAnimation.h" +#include "BattleSiegeController.h" +#include "BattleInterfaceClasses.h" +#include "BattleInterface.h" +#include "BattleAnimationClasses.h" +#include "BattleFieldController.h" +#include "BattleEffectsController.h" +#include "BattleProjectileController.h" +#include "BattleControlPanel.h" +#include "BattleRenderer.h" +#include "CreatureAnimation.h" #include "../CPlayerInterface.h" #include "../CMusicHandler.h" diff --git a/client/battle/CBattleStacksController.h b/client/battle/BattleStacksController.h similarity index 100% rename from client/battle/CBattleStacksController.h rename to client/battle/BattleStacksController.h diff --git a/client/battle/CCreatureAnimation.cpp b/client/battle/CreatureAnimation.cpp similarity index 96% rename from client/battle/CCreatureAnimation.cpp rename to client/battle/CreatureAnimation.cpp index 01c3153f5..376b1ea4c 100644 --- a/client/battle/CCreatureAnimation.cpp +++ b/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" diff --git a/client/battle/CCreatureAnimation.h b/client/battle/CreatureAnimation.h similarity index 100% rename from client/battle/CCreatureAnimation.h rename to client/battle/CreatureAnimation.h diff --git a/client/gui/CGuiHandler.cpp b/client/gui/CGuiHandler.cpp index 410e9b8ae..bff44534f 100644 --- a/client/gui/CGuiHandler.cpp +++ b/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 SDLEventsQueue; extern boost::mutex eventsM; diff --git a/client/widgets/AdventureMapClasses.cpp b/client/widgets/AdventureMapClasses.cpp index 472fa94e6..f2e97c06d 100644 --- a/client/widgets/AdventureMapClasses.cpp +++ b/client/widgets/AdventureMapClasses.cpp @@ -31,8 +31,8 @@ #include "../windows/CAdvmapInterface.h" #include "../windows/GUIClasses.h" -#include "../battle/CBattleInterfaceClasses.h" -#include "../battle/CBattleInterface.h" +#include "../battle/BattleInterfaceClasses.h" +#include "../battle/BattleInterface.h" #include "../../CCallback.h" #include "../../lib/StartInfo.h" diff --git a/client/widgets/Buttons.cpp b/client/widgets/Buttons.cpp index c44a5983c..3bb2fe0f3 100644 --- a/client/widgets/Buttons.cpp +++ b/client/widgets/Buttons.cpp @@ -16,8 +16,8 @@ #include "../CMusicHandler.h" #include "../CGameInfo.h" #include "../CPlayerInterface.h" -#include "../battle/CBattleInterface.h" -#include "../battle/CBattleInterfaceClasses.h" +#include "../battle/BattleInterface.h" +#include "../battle/BattleInterfaceClasses.h" #include "../gui/CAnimation.h" #include "../gui/CGuiHandler.h" #include "../windows/InfoWindows.h" diff --git a/client/widgets/Images.cpp b/client/widgets/Images.cpp index bd0253ad1..84d9fb63b 100644 --- a/client/widgets/Images.cpp +++ b/client/widgets/Images.cpp @@ -17,8 +17,8 @@ #include "../gui/CGuiHandler.h" #include "../gui/CCursorHandler.h" -#include "../battle/CBattleInterface.h" -#include "../battle/CBattleInterfaceClasses.h" +#include "../battle/BattleInterface.h" +#include "../battle/BattleInterfaceClasses.h" #include "../CBitmapHandler.h" #include "../Graphics.h" diff --git a/client/windows/CSpellWindow.cpp b/client/windows/CSpellWindow.cpp index 13c3e1d2e..93a885f5c 100644 --- a/client/windows/CSpellWindow.cpp +++ b/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" diff --git a/client/windows/CWindowObject.cpp b/client/windows/CWindowObject.cpp index d2f2df279..b55271543 100644 --- a/client/windows/CWindowObject.cpp +++ b/client/windows/CWindowObject.cpp @@ -20,8 +20,8 @@ #include "../gui/CGuiHandler.h" #include "../gui/CCursorHandler.h" -#include "../battle/CBattleInterface.h" -#include "../battle/CBattleInterfaceClasses.h" +#include "../battle/BattleInterface.h" +#include "../battle/BattleInterfaceClasses.h" #include "../Graphics.h" #include "../CGameInfo.h" diff --git a/client/windows/GUIClasses.cpp b/client/windows/GUIClasses.cpp index 207d7f734..91a51c84a 100644 --- a/client/windows/GUIClasses.cpp +++ b/client/windows/GUIClasses.cpp @@ -26,8 +26,8 @@ #include "../mapHandler.h" #include "../CServerHandler.h" -#include "../battle/CBattleInterfaceClasses.h" -#include "../battle/CBattleInterface.h" +#include "../battle/BattleInterfaceClasses.h" +#include "../battle/BattleInterface.h" #include "../gui/CAnimation.h" #include "../gui/CGuiHandler.h" diff --git a/client/windows/InfoWindows.cpp b/client/windows/InfoWindows.cpp index 1f04bad56..5fa9ffb45 100644 --- a/client/windows/InfoWindows.cpp +++ b/client/windows/InfoWindows.cpp @@ -26,8 +26,8 @@ #include "../gui/CGuiHandler.h" #include "../gui/CCursorHandler.h" -#include "../battle/CBattleInterface.h" -#include "../battle/CBattleInterfaceClasses.h" +#include "../battle/BattleInterface.h" +#include "../battle/BattleInterfaceClasses.h" #include "../../CCallback.h"