games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

fix includes in client subdirectories

Browse Source
This commit is contained in:
Andrey Filipenkov 2022-09-18 15:47:49 +03:00
parent 0163190ac5
commit a320af837d
15 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/gui/CAnimation.cpp
View File

@ -10,10 +10,11 @@
#include "StdInc.h"
#include "CAnimation.h"
#include "SDL_Extensions.h"
#include "SDL_Pixels.h"
#include "../CBitmapHandler.h"
#include "../Graphics.h"
#include "../gui/SDL_Extensions.h"
#include "../gui/SDL_Pixels.h"
#include "../lib/filesystem/Filesystem.h"
#include "../lib/filesystem/ISimpleResourceLoader.h"

3
client/mainmenu/CCampaignScreen.cpp
View File

@ -9,9 +9,10 @@
*/
#include "StdInc.h"
#include "../mainmenu/CMainMenu.h"
#include "CCampaignScreen.h"
#include "CMainMenu.h"
#include "../CGameInfo.h"
#include "../CMessage.h"
#include "../CBitmapHandler.h"

2
client/mainmenu/CCampaignScreen.h
View File

@ -9,6 +9,8 @@
*/
#pragma once
#include "../windows/CWindowObject.h"
class CLabel;
class CPicture;
class CButton;

5
client/mainmenu/CreditsScreen.cpp
View File

@ -9,9 +9,10 @@
*/
#include "StdInc.h"
#include "CreditsScreen.h"
#include "../mainmenu/CMainMenu.h"
#include "CMainMenu.h"
#include "../gui/CGuiHandler.h"
#include "../widgets/TextControls.h"
#include "../widgets/ObjectLists.h"

3
client/widgets/AdventureMapClasses.cpp
View File

@ -14,6 +14,7 @@
#include "MiscWidgets.h"
#include "CComponent.h"
#include "Images.h"
#include "../CGameInfo.h"
#include "../CMusicHandler.h"
@ -26,8 +27,6 @@
#include "../gui/SDL_Pixels.h"
#include "../gui/SDL_Compat.h"
#include "../widgets/Images.h"
#include "../windows/InfoWindows.h"
#include "../windows/CAdvmapInterface.h"
#include "../windows/GUIClasses.h"

5
client/widgets/CComponent.cpp
View File

@ -10,6 +10,9 @@
#include "StdInc.h"
#include "CComponent.h"
#include "CArtifactHolder.h"
#include "Images.h"
#include <vcmi/spells/Service.h>
#include <vcmi/spells/Spell.h>
@ -18,8 +21,6 @@
#include "../CMessage.h"
#include "../CGameInfo.h"
#include "../widgets/Images.h"
#include "../widgets/CArtifactHolder.h"
#include "../windows/CAdvmapInterface.h"
#include "../../lib/CArtHandler.h"

5
client/widgets/CGarrisonInt.cpp
View File

@ -10,12 +10,13 @@
#include "StdInc.h"
#include "CGarrisonInt.h"
#include "Buttons.h"
#include "TextControls.h"
#include "../gui/CGuiHandler.h"
#include "../CGameInfo.h"
#include "../CPlayerInterface.h"
#include "../widgets/Buttons.h"
#include "../widgets/TextControls.h"
#include "../windows/CCreatureWindow.h"
#include "../windows/GUIClasses.h"

4
client/windows/CAdvmapInterface.cpp
View File

@ -14,8 +14,9 @@
#include "CHeroWindow.h"
#include "CKingdomInterface.h"
#include "CSpellWindow.h"
#include "GUIClasses.h"
#include "CTradeWindow.h"
#include "GUIClasses.h"
#include "InfoWindows.h"
#include "../CBitmapHandler.h"
#include "../CGameInfo.h"
@ -35,7 +36,6 @@
#include "../gui/CGuiHandler.h"
#include "../gui/SDL_Extensions.h"
#include "../widgets/MiscWidgets.h"
#include "../windows/InfoWindows.h"
#include "../../CCallback.h"

2
client/windows/CCastleInterface.cpp
View File

@ -13,6 +13,7 @@
#include "CAdvmapInterface.h"
#include "CHeroWindow.h"
#include "CTradeWindow.h"
#include "InfoWindows.h"
#include "GUIClasses.h"
#include "QuickRecruitmentWindow.h"
@ -24,7 +25,6 @@
#include "../Graphics.h"
#include "../gui/CGuiHandler.h"
#include "../gui/SDL_Extensions.h"
#include "../windows/InfoWindows.h"
#include "../widgets/MiscWidgets.h"
#include "../widgets/CComponent.h"

2
client/windows/CKingdomInterface.cpp
View File

@ -12,6 +12,7 @@
#include "CAdvmapInterface.h"
#include "CCastleInterface.h"
#include "InfoWindows.h"
#include "../CGameInfo.h"
#include "../CMT.h"
@ -19,7 +20,6 @@
#include "../gui/CGuiHandler.h"
#include "../widgets/CComponent.h"
#include "../widgets/MiscWidgets.h"
#include "../windows/InfoWindows.h"
#include "../../CCallback.h"

5
client/windows/CWindowObject.cpp
View File

@ -10,6 +10,8 @@
#include "StdInc.h"
#include "CWindowObject.h"
#include "CAdvmapInterface.h"
#include "../widgets/MiscWidgets.h"
#include "../gui/SDL_Pixels.h"
@ -26,7 +28,6 @@
#include "../CPlayerInterface.h"
#include "../CMessage.h"
#include "../CMusicHandler.h"
#include "../windows/CAdvmapInterface.h"
#include "../../CCallback.h"
@ -251,4 +252,4 @@ void CStatusbarWindow::activate()
{
CIntObject::activate();
GH.statusbar = statusbar;
}
}

2
client/windows/GUIClasses.cpp
View File

@ -15,6 +15,7 @@
#include "CCreatureWindow.h"
#include "CHeroWindow.h"
#include "CreatureCostBox.h"
#include "InfoWindows.h"
#include "../CBitmapHandler.h"
#include "../CGameInfo.h"
@ -36,7 +37,6 @@
#include "../widgets/CComponent.h"
#include "../widgets/MiscWidgets.h"
#include "../windows/InfoWindows.h"
#include "../lobby/CSavingScreen.h"

2
client/windows/GUIClasses.h
View File

@ -9,13 +9,13 @@
*/
#pragma once
#include "CWindowObject.h"
#include "../lib/GameConstants.h"
#include "../lib/ResourceSet.h"
#include "../lib/CConfigHandler.h"
#include "../widgets/CArtifactHolder.h"
#include "../widgets/CGarrisonInt.h"
#include "../widgets/Images.h"
#include "../windows/CWindowObject.h"
class CGDwelling;
class CreatureCostBox;

3
client/windows/InfoWindows.cpp
View File

@ -10,6 +10,8 @@
#include "StdInc.h"
#include "InfoWindows.h"
#include "CAdvmapInterface.h"
#include "../CBitmapHandler.h"
#include "../Graphics.h"
#include "../CGameInfo.h"
@ -17,7 +19,6 @@
#include "../CMessage.h"
#include "../CMusicHandler.h"
#include "../windows/CAdvmapInterface.h"
#include "../widgets/CComponent.h"
#include "../widgets/MiscWidgets.h"

2
lib/filesystem/Filesystem.cpp
View File

@ -156,7 +156,7 @@ ISimpleResourceLoader * CResourceHandler::createInitial()
void CResourceHandler::initialize()
{
// Create tree-loke structure that looks like this:
// Create tree-like structure that looks like this:
// root
// |
// |- initial