Reorganized client source tree:

- client/widgets for reusable GUI elements
- client/windows for independent windows
- client/gui for base GUI classes which should remain internal

client/CMT.cpp

@@ -8,13 +8,13 @@
 
 #include "../lib/filesystem/Filesystem.h"
 #include "CPreGame.h"
-#include "CCastleInterface.h"
+#include "windows/CCastleInterface.h"
 #include "../lib/CConsoleHandler.h"
 #include "gui/CCursorHandler.h"
 #include "../lib/CGameState.h"
 #include "../CCallback.h"
 #include "CPlayerInterface.h"
-#include "CAdvmapInterface.h"
+#include "windows/CAdvmapInterface.h"
 #include "../lib/CBuildingHandler.h"
 #include "CVideoHandler.h"
 #include "../lib/CHeroHandler.h"

client/CMakeLists.txt

@@ -14,39 +14,41 @@ set(client_SRCS
 		battle/CBattleInterfaceClasses.cpp
 		battle/CCreatureAnimation.cpp
 
-		gui/CArtifactHolder.cpp
-		gui/CComponent.cpp
-		gui/CGarrisonInt.cpp
+		gui/CCursorHandler.cpp
 		gui/CGuiHandler.cpp
 		gui/CIntObject.cpp
-		gui/CIntObjectClasses.cpp
-		gui/CTradeWindow.cpp
 		gui/Fonts.cpp
 		gui/Geometries.cpp
-		gui/MiscWidgets.cpp
-		gui/CCursorHandler.cpp
 		gui/SDL_Extensions.cpp
 
-		CPreGame.cpp
-		Client.cpp
-		CPlayerInterface.cpp
-		CMT.cpp
-		GUIClasses.cpp
-		AdventureMapClasses.cpp
-		CAdvmapInterface.cpp
-		CAnimation.cpp
+		widgets/AdventureMapClasses.cpp
+		widgets/CAnimation.cpp
+		widgets/CArtifactHolder.cpp
+		widgets/CComponent.cpp
+		widgets/CGarrisonInt.cpp
+		widgets/CIntObjectClasses.cpp
+		widgets/MiscWidgets.cpp
+
+		windows/CAdvmapInterface.cpp
+		windows/CCastleInterface.cpp
+		windows/CCreatureWindow.cpp
+		windows/CHeroWindow.cpp
+		windows/CKingdomInterface.cpp
+		windows/CQuestLog.cpp
+		windows/CSpellWindow.cpp
+		windows/CTradeWindow.cpp
+		windows/GUIClasses.cpp
+
 		CBitmapHandler.cpp
-		CCastleInterface.cpp
-		CCreatureWindow.cpp
 		CDefHandler.cpp
 		CGameInfo.cpp
-		CHeroWindow.cpp
-		CKingdomInterface.cpp
+		Client.cpp
 		CMessage.cpp
+		CMT.cpp
 		CMusicHandler.cpp
-		CSpellWindow.cpp
+		CPlayerInterface.cpp
+		CPreGame.cpp
 		CVideoHandler.cpp
-		CQuestLog.cpp
 		Graphics.cpp
 		mapHandler.cpp
 		NetPacksClient.cpp

client/CMessage.cpp

@@ -13,16 +13,16 @@
 
 #include "SDL_ttf.h"
 #include "CDefHandler.h"
-#include "CAnimation.h"
+#include "widgets/CAnimation.h"
 #include "CGameInfo.h"
 #include "gui/SDL_Extensions.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "Graphics.h"
-#include "GUIClasses.h"
+#include "windows/GUIClasses.h"
 #include "../lib/CConfigHandler.h"
 #include "CBitmapHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
+#include "widgets/CIntObjectClasses.h"
+#include "widgets/MiscWidgets.h"
 
 const int BETWEEN_COMPS_ROWS = 10;
 const int BEFORE_COMPONENTS = 30;

client/CPlayerInterface.cpp

@@ -1,23 +1,23 @@
 #include "StdInc.h"
-#include "CAdvmapInterface.h"
+#include "windows/CAdvmapInterface.h"
 #include "battle/CBattleInterface.h"
 #include "battle/CBattleInterfaceClasses.h"
 #include "../CCallback.h"
-#include "CCastleInterface.h"
+#include "windows/CCastleInterface.h"
 #include "gui/CCursorHandler.h"
-#include "CKingdomInterface.h"
+#include "windows/CKingdomInterface.h"
 #include "CGameInfo.h"
-#include "CHeroWindow.h"
-#include "CCreatureWindow.h"
-#include "CQuestLog.h"
+#include "windows/CHeroWindow.h"
+#include "windows/CCreatureWindow.h"
+#include "windows/CQuestLog.h"
 #include "CMessage.h"
 #include "CPlayerInterface.h"
 #include "gui/SDL_Extensions.h"
-#include "gui/CTradeWindow.h"
+#include "windows/CTradeWindow.h"
 #include "../lib/CConfigHandler.h"
 #include "battle/CCreatureAnimation.h"
 #include "Graphics.h"
-#include "GUIClasses.h"
+#include "windows/GUIClasses.h"
 #include "../lib/CArtHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
@@ -37,7 +37,7 @@
 #include "../lib/CGameState.h"
 #include "../lib/GameConstants.h"
 #include "gui/CGuiHandler.h"
-#include "gui/MiscWidgets.h"
+#include "widgets/MiscWidgets.h"
 #include "../lib/UnlockGuard.h"
 
 #ifdef min

client/CPreGame.cpp

@@ -9,7 +9,7 @@
 #include "gui/SDL_Extensions.h"
 #include "CGameInfo.h"
 #include "gui/CCursorHandler.h"
-#include "CAnimation.h"
+#include "widgets/CAnimation.h"
 #include "CDefHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CTownHandler.h"
@@ -23,7 +23,7 @@
 #include "../lib/Connection.h"
 #include "../lib/VCMIDirs.h"
 #include "../lib/mapping/CMap.h"
-#include "GUIClasses.h"
+#include "windows/GUIClasses.h"
 #include "CPlayerInterface.h"
 #include "../CCallback.h"
 #include "CMessage.h"
@@ -38,8 +38,8 @@
 #include "../lib/CConfigHandler.h"
 #include "../lib/GameConstants.h"
 #include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
+#include "widgets/CIntObjectClasses.h"
+#include "widgets/MiscWidgets.h"
 #include "../lib/mapping/CMapService.h"
 #include "../lib/mapping/CMap.h"
 #include "../lib/CRandomGenerator.h"

client/CPreGame.h

@@ -5,7 +5,7 @@
 #include "../lib/FunctionList.h"
 #include "../lib/mapping/CMapInfo.h"
 #include "../lib/rmg/CMapGenerator.h"
-#include "gui/CIntObjectClasses.h"
+#include "widgets/CIntObjectClasses.h"
 
 /*
  * CPreGame.h, part of VCMI engine

client/Graphics.cpp

@@ -21,7 +21,7 @@
 #include "../lib/vcmi_endian.h"
 #include "../lib/GameConstants.h"
 #include "../lib/CStopWatch.h"
-#include "CAnimation.h"
+#include "widgets/CAnimation.h"
 #include "../lib/mapObjects/CObjectClassesHandler.h"
 
 using namespace boost::assign;

client/NetPacksClient.cpp

@@ -17,7 +17,7 @@
 #include "../lib/CSoundBase.h"
 #include "../lib/StartInfo.h"
 #include "mapHandler.h"
-#include "GUIClasses.h"
+#include "windows/GUIClasses.h"
 #include "../lib/CConfigHandler.h"
 #include "gui/SDL_Extensions.h"
 #include "battle/CBattleInterface.h"
@@ -26,8 +26,8 @@
 #include "../lib/BattleState.h"
 #include "../lib/GameConstants.h"
 #include "gui/CGuiHandler.h"
-#include "gui/MiscWidgets.h"
-#include "AdventureMapClasses.h"
+#include "widgets/MiscWidgets.h"
+#include "widgets/AdventureMapClasses.h"
 #include "CMT.h"
 
 //macros to avoid code duplication - calls given method with given arguments if interface for specific player is present

client/battle/CBattleAnimations.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../CAnimation.h"
+#include "../widgets/CAnimation.h"
 #include "../../lib/BattleHex.h"
 
 class CBattleInterface;

client/battle/CBattleInterface.cpp

@@ -1,40 +1,38 @@
 #include "StdInc.h"
 #include "CBattleInterface.h"
 
-#include "../CGameInfo.h"
-#include "../gui/SDL_Extensions.h"
-#include "../CAdvmapInterface.h"
-#include "../CAnimation.h"
+#include "CBattleAnimations.h"
+#include "CBattleInterfaceClasses.h"
+#include "CCreatureAnimation.h"
+
 #include "../CBitmapHandler.h"
-#include "../../lib/CHeroHandler.h"
-# include "../CDefHandler.h"
-#include "../../lib/CSpellHandler.h"
-#include "../CMusicHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
 #include "../CMessage.h"
+#include "../CMT.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../CVideoHandler.h"
+#include "../Graphics.h"
+#include "../gui/CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CAnimation.h"
+#include "../windows/CAdvmapInterface.h"
+#include "../windows/CCreatureWindow.h"
+#include "../windows/CSpellWindow.h"
+
 #include "../../CCallback.h"
 #include "../../lib/BattleState.h"
-#include "../../lib/CGeneralTextHandler.h"
-#include "CCreatureAnimation.h"
-#include "../Graphics.h"
-#include "../CSpellWindow.h"
 #include "../../lib/CConfigHandler.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
 #include "../../lib/CondSh.h"
-#include "../../lib/NetPacks.h"
-#include "../CPlayerInterface.h"
-#include "../CCreatureWindow.h"
-#include "../CVideoHandler.h"
+#include "../../lib/CRandomGenerator.h"
+#include "../../lib/CSpellHandler.h"
 #include "../../lib/CTownHandler.h"
 #include "../../lib/mapping/CMap.h"
-#include "../../lib/CRandomGenerator.h"
-
-#include "CBattleAnimations.h"
-#include "CBattleInterfaceClasses.h"
-
-#include "../gui/CCursorHandler.h"
-#include "../gui/CGuiHandler.h"
-#include "../CMT.h"
-
-
+#include "../../lib/NetPacks.h"
 #include "../../lib/UnlockGuard.h"
 
 using namespace boost::assign;

client/battle/CBattleInterface.h

@@ -3,8 +3,10 @@
 
 #include "../../lib/CCreatureSet.h"
 #include "../../lib/ConstTransitivePtr.h" //may be reundant
-#include "../CAnimation.h"
 #include "../../lib/GameConstants.h"
+
+#include "../widgets/CAnimation.h"
+
 #include "CBattleAnimations.h"
 
 /*

client/battle/CBattleInterfaceClasses.cpp

@@ -1,29 +1,31 @@
 #include "StdInc.h"
 #include "CBattleInterfaceClasses.h"
 
-#include "../gui/SDL_Extensions.h"
 #include "CBattleInterface.h"
-#include "../CGameInfo.h"
+
+#include "../CBitmapHandler.h"
 #include "../CDefHandler.h"
-#include "../gui/CCursorHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMusicHandler.h"
 #include "../CPlayerInterface.h"
-#include "../../CCallback.h"
-#include "../CSpellWindow.h"
+#include "../CVideoHandler.h"
 #include "../Graphics.h"
-#include "../../lib/CConfigHandler.h"
+#include "../gui/CCursorHandler.h"
 #include "../gui/CGuiHandler.h"
-#include "../gui/CIntObjectClasses.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../windows/CCreatureWindow.h"
+#include "../windows/CSpellWindow.h"
+
+#include "../../CCallback.h"
+#include "../../lib/BattleState.h"
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CCreatureHandler.h"
 #include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CTownHandler.h"
 #include "../../lib/NetPacks.h"
-#include "../../lib/CCreatureHandler.h"
-#include "../../lib/BattleState.h"
 #include "../../lib/StartInfo.h"
-#include "../CMusicHandler.h"
-#include "../CVideoHandler.h"
-#include "../../lib/CTownHandler.h"
-#include "../CBitmapHandler.h"
-#include "../CCreatureWindow.h"
-#include "../CMessage.h"
 
 /*
  * CBattleInterfaceClasses.cpp, part of VCMI engine

client/battle/CCreatureAnimation.cpp

@@ -1,16 +1,16 @@
 #include "StdInc.h"
 #include "CCreatureAnimation.h"
 
+#include "../../lib/vcmi_endian.h"
 #include "../../lib/CConfigHandler.h"
 #include "../../lib/CCreatureHandler.h"
-#include "../../lib/vcmi_endian.h"
-#include "../gui/SDL_Extensions.h"
-#include "../gui/SDL_Pixels.h"
-
 #include "../../lib/filesystem/Filesystem.h"
 #include "../../lib/filesystem/CBinaryReader.h"
 #include "../../lib/filesystem/CMemoryStream.h"
 
+#include "../gui/SDL_Extensions.h"
+#include "../gui/SDL_Pixels.h"
+
 /*
  * CCreatureAnimation.cpp, part of VCMI engine
  *

client/battle/CCreatureAnimation.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../../lib/FunctionList.h"
-#include "../CAnimation.h"
+#include "../widgets/CAnimation.h"
 
 /*
  * CCreatureAnimation.h, part of VCMI engine

client/gui/CCursorHandler.cpp

@@ -2,10 +2,12 @@
 #include "CCursorHandler.h"
 
 #include <SDL.h>
+
 #include "SDL_Extensions.h"
-#include "../CAnimation.h"
 #include "CGuiHandler.h"
+
 #include "../CMT.h"
+#include "../widgets/CAnimation.h"
 
 /*
  * CCursorHandler.cpp, part of VCMI engine

client/gui/CGuiHandler.cpp

@@ -1,10 +1,10 @@
 #include "StdInc.h"
 #include "CGuiHandler.h"
 
-
 #include "CIntObject.h"
-#include "../CGameInfo.h"
 #include "CCursorHandler.h"
+
+#include "../CGameInfo.h"
 #include "../../lib/CThreadHelper.h"
 #include "../../lib/CConfigHandler.h"
 #include "../CMT.h"

client/gui/CIntObject.cpp

@@ -1,5 +1,6 @@
 #include "StdInc.h"
 #include "CIntObject.h"
+
 #include "CGuiHandler.h"
 #include "SDL_Extensions.h"
 #include "../CMessage.h"

client/gui/SDL_Extensions.cpp

@@ -2,7 +2,6 @@
 #include "SDL_Extensions.h"
 #include "SDL_Pixels.h"
 
-#include <SDL_ttf.h>
 #include "../CGameInfo.h"
 #include "../CMessage.h"
 #include "../CDefHandler.h"

client/AdventureMapClasses.cpp → client/widgets/AdventureMapClasses.cpp

@@ -1,33 +1,37 @@
 #include "StdInc.h"
 #include "AdventureMapClasses.h"
 
-#include "../CCallback.h"
-#include "../lib/JsonNode.h"
-#include "../lib/filesystem/Filesystem.h"
-#include "../lib/mapping/CMap.h"
-#include "../lib/CModHandler.h"
-#include "../lib/mapObjects/CGHeroInstance.h"
-#include "../lib/CGameState.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CTownHandler.h"
-#include "../lib/NetPacksBase.h"
-#include "../lib/CHeroHandler.h"
-#include "../lib/StringConstants.h"
-#include "CAdvmapInterface.h"
 #include "CAnimation.h"
-#include "CGameInfo.h"
-#include "CPlayerInterface.h"
-#include "CMusicHandler.h"
-#include "Graphics.h"
-#include "GUIClasses.h"
-#include "StartInfo.h"
-#include "CPreGame.h"
-#include "gui/CGuiHandler.h"
-#include "gui/SDL_Pixels.h"
-#include "gui/MiscWidgets.h"
-#include "battle/CBattleInterface.h"
-#include "battle/CBattleInterfaceClasses.h"
-#include "gui/MiscWidgets.h"
+#include "MiscWidgets.h"
+
+#include "../CGameInfo.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../CPreGame.h"
+#include "../Graphics.h"
+
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Pixels.h"
+
+#include "../windows/CAdvmapInterface.h"
+#include "../windows/GUIClasses.h"
+
+#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/CBattleInterface.h"
+
+#include "../../CCallback.h"
+#include "../../lib/StartInfo.h"
+#include "../../lib/CGameState.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/filesystem/Filesystem.h"
+#include "../../lib/JsonNode.h"
+#include "../../lib/mapObjects/CGHeroInstance.h"
+#include "../../lib/mapping/CMap.h"
+#include "../../lib/NetPacksBase.h"
+#include "../../lib/StringConstants.h"
 
 /*
  * CAdventureMapClasses.h, part of VCMI engine

client/AdventureMapClasses.h → client/widgets/AdventureMapClasses.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "gui/CIntObjectClasses.h"
+#include "CIntObjectClasses.h"
 
 class CArmedInstance;
 class CShowableAnim;

client/CAnimation.cpp → client/widgets/CAnimation.cpp

@@ -1,17 +1,18 @@
 #include "StdInc.h"
+#include "CAnimation.h"
+
 #include <SDL_image.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"
 #include "../lib/JsonNode.h"
 #include "../lib/CRandomGenerator.h"
 
-#include "CBitmapHandler.h"
-#include "Graphics.h"
-#include "CAnimation.h"
-#include "gui/SDL_Extensions.h"
-#include "gui/SDL_Pixels.h"
-
 /*
  * CAnimation.cpp, part of VCMI engine
  *

client/CAnimation.h → client/widgets/CAnimation.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../lib/vcmi_endian.h"
-#include "gui/CIntObject.h"
+#include "../../lib/vcmi_endian.h"
+#include "../gui/CIntObject.h"
 
 /*
  * CAnimation.h, part of VCMI engine

client/gui/CArtifactHolder.cpp → client/widgets/CArtifactHolder.cpp

@@ -1,15 +1,15 @@
 #include "StdInc.h"
 #include "CArtifactHolder.h"
 
-#include "CGuiHandler.h"
-#include "CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
 
-#include "../CAnimation.h"
-#include "../CHeroWindow.h"
-#include "../CSpellWindow.h"
+#include "CAnimation.h"
+#include "../windows/CHeroWindow.h"
+#include "../windows/CSpellWindow.h"
+#include "../windows/GUIClasses.h"
 #include "../CPlayerInterface.h"
 #include "../CGameInfo.h"
-#include "../GUIClasses.h" // FIXME: kill this include
 
 #include "../../CCallback.h"
 

client/gui/CArtifactHolder.h → client/widgets/CArtifactHolder.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "CComponent.h"
-#include "gui/CIntObject.h"
-#include "../lib/NetPacksBase.h"
+#include "../gui/CIntObject.h"
+#include "../../lib/NetPacksBase.h"
 
 /*
  * CArtifactHolder.h, part of VCMI engine

client/gui/CComponent.cpp → client/widgets/CComponent.cpp

@@ -1,13 +1,13 @@
 #include "StdInc.h"
 #include "CComponent.h"
 
-#include "CGuiHandler.h"
-#include "CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
 
-#include "../CAnimation.h"
+#include "CAnimation.h"
 #include "../CMessage.h"
 #include "../CGameInfo.h"
-#include "../CAdvmapInterface.h"
+#include "../windows/CAdvmapInterface.h"
 
 #include "../../lib/CArtHandler.h"
 #include "../../lib/CTownHandler.h"

client/gui/CComponent.h → client/widgets/CComponent.h

@@ -1,8 +1,7 @@
 #pragma once
 
 #include "../../lib/NetPacksBase.h"
-#include "gui/CIntObject.h"
-#include "gui/CIntObjectClasses.h"
+#include "CIntObjectClasses.h"
 
 /*
  * CComponent.h, part of VCMI engine

client/gui/CGarrisonInt.cpp → client/widgets/CGarrisonInt.cpp

@@ -1,13 +1,13 @@
 #include "StdInc.h"
 #include "CGarrisonInt.h"
 
-#include "CGuiHandler.h"
+#include "../gui/CGuiHandler.h"
 
-#include "../CAnimation.h"
-#include "../CCreatureWindow.h"
+#include "CAnimation.h"
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"
-#include "../GUIClasses.h"
+#include "../windows/CCreatureWindow.h"
+#include "../windows/GUIClasses.h"
 
 #include "../../CCallback.h"
 

client/gui/CGarrisonInt.h → client/widgets/CGarrisonInt.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "CIntObject.h"
 #include "CIntObjectClasses.h"
 
 /*

client/gui/CIntObjectClasses.cpp → client/widgets/CIntObjectClasses.cpp

@@ -1,23 +1,24 @@
 #include "StdInc.h"
 #include "CIntObjectClasses.h"
 
-#include "SDL_Pixels.h"
-#include "SDL_Extensions.h"
-#include "CGuiHandler.h"
-#include "CCursorHandler.h"
+#include "CAnimation.h"
 #include "MiscWidgets.h"
 
+#include "../gui/SDL_Pixels.h"
+#include "../gui/SDL_Extensions.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
+
 #include "../battle/CBattleInterface.h"
 #include "../battle/CBattleInterfaceClasses.h"
 
 #include "../CBitmapHandler.h"
 #include "../Graphics.h"
-#include "../CAnimation.h"
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"
 #include "../CMessage.h"
 #include "../CMusicHandler.h"
-#include "../CAdvmapInterface.h"
+#include "../windows/CAdvmapInterface.h"
 
 #include "../../CCallback.h"
 

client/gui/CIntObjectClasses.h → client/widgets/CIntObjectClasses.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CIntObject.h"
-#include "SDL_Extensions.h"
+#include "../gui/CIntObject.h"
+#include "../gui/SDL_Extensions.h"
 #include "../../lib/FunctionList.h"
 
 struct SDL_Surface;

client/gui/MiscWidgets.cpp → client/widgets/MiscWidgets.cpp

@@ -1,15 +1,15 @@
 #include "StdInc.h"
 #include "MiscWidgets.h"
 
-#include "CGuiHandler.h"
-#include "CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
 
 #include "../CBitmapHandler.h"
 #include "../CPlayerInterface.h"
 #include "../CMessage.h"
 #include "../CGameInfo.h"
-#include "../CAdvmapInterface.h"
-#include "../CCastleInterface.h"
+#include "../windows/CAdvmapInterface.h"
+#include "../windows/CCastleInterface.h"
 
 #include "../../CCallback.h"
 

client/CAdvmapInterface.cpp → client/windows/CAdvmapInterface.cpp

@@ -1,39 +1,43 @@
 #include "StdInc.h"
 #include "CAdvmapInterface.h"
 
-#include "../CCallback.h"
 #include "CCastleInterface.h"
-#include "gui/CCursorHandler.h"
-#include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CKingdomInterface.h"
-#include "CMessage.h"
-#include "CPlayerInterface.h"
-#include "gui/SDL_Extensions.h"
-#include "CBitmapHandler.h"
-#include "../lib/CConfigHandler.h"
 #include "CSpellWindow.h"
-#include "Graphics.h"
 #include "GUIClasses.h"
-#include "CDefHandler.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CHeroHandler.h"
-#include "../lib/mapObjects/CGHeroInstance.h"
-#include "../lib/CTownHandler.h"
-#include "../lib/mapping/CMap.h"
-#include "../lib/JsonNode.h"
-#include "mapHandler.h"
-#include "CPreGame.h"
-#include "../lib/VCMI_Lib.h"
-#include "../lib/CSpellHandler.h"
-#include "../lib/CSoundBase.h"
-#include "../lib/CGameState.h"
-#include "CMusicHandler.h"
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/CTradeWindow.h"
-#include "gui/MiscWidgets.h"
-#include "../lib/UnlockGuard.h"
+#include "CTradeWindow.h"
+
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../CPreGame.h"
+#include "../Graphics.h"
+#include "../mapHandler.h"
+
+#include "../gui/CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CGameState.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CSoundBase.h"
+#include "../../lib/CSpellHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/JsonNode.h"
+#include "../../lib/mapObjects/CGHeroInstance.h"
+#include "../../lib/mapping/CMap.h"
+#include "../../lib/UnlockGuard.h"
+#include "../../lib/VCMI_Lib.h"
 
 #ifdef _MSC_VER
 #pragma warning (disable : 4355)

client/CAdvmapInterface.h → client/windows/CAdvmapInterface.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "gui/CIntObject.h"
-#include "AdventureMapClasses.h"
+#include "../gui/CIntObject.h"
+#include "../widgets/AdventureMapClasses.h"
 
 class CDefHandler;
 class CCallback;

client/CCastleInterface.cpp → client/windows/CCastleInterface.cpp

@@ -1,33 +1,36 @@
 #include "StdInc.h"
 #include "CCastleInterface.h"
 
-#include "../CCallback.h"
-#include "../lib/CArtHandler.h"
-#include "../lib/CBuildingHandler.h"
-#include "../lib/CCreatureHandler.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CModHandler.h"
-#include "../lib/mapObjects/CGHeroInstance.h"
-#include "../lib/CSpellHandler.h"
-#include "../lib/CTownHandler.h"
 #include "CAdvmapInterface.h"
-#include "CAnimation.h"
-#include "CBitmapHandler.h"
-#include "CDefHandler.h"
-#include "CGameInfo.h"
 #include "CHeroWindow.h"
-#include "CMessage.h"
-#include "CMusicHandler.h"
-#include "CPlayerInterface.h"
-#include "Graphics.h"
-#include "gui/SDL_Extensions.h"
-#include "../lib/GameConstants.h"
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/CTradeWindow.h"
-#include "gui/MiscWidgets.h"
+#include "CTradeWindow.h"
 #include "GUIClasses.h"
 
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../Graphics.h"
+
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+#include "../../lib/CArtHandler.h"
+#include "../../lib/CBuildingHandler.h"
+#include "../../lib/CCreatureHandler.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CSpellHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/GameConstants.h"
+#include "../../lib/mapObjects/CGHeroInstance.h"
+
 using namespace boost::assign;
 
 /*

client/CCastleInterface.h → client/windows/CCastleInterface.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CAnimation.h"
-#include "gui/CGarrisonInt.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/CGarrisonInt.h"
 
 class CAdventureMapButton;
 class CBuilding;

client/CCreatureWindow.cpp → client/windows/CCreatureWindow.cpp

@@ -1,32 +1,30 @@
 #include "StdInc.h"
 #include "CCreatureWindow.h"
 
-#include "../lib/CCreatureSet.h"
-#include "CGameInfo.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/BattleState.h"
-#include "../CCallback.h"
-
-#include <SDL.h>
-#include "gui/SDL_Extensions.h"
-#include "CBitmapHandler.h"
-#include "CDefHandler.h"
-#include "Graphics.h"
-#include "CPlayerInterface.h"
-#include "../lib/CConfigHandler.h"
-#include "CAnimation.h"
-
-#include "../lib/CGameState.h"
-#include "../lib/BattleState.h"
-#include "../lib/CSpellHandler.h"
-#include "../lib/CArtHandler.h"
-#include "../lib/NetPacksBase.h" //ArtifactLocation
-#include "../lib/CModHandler.h"
-#include "../lib/IBonusTypeHandler.h"
-
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CPlayerInterface.h"
+#include "../Graphics.h"
+
+#include "../gui/SDL_Extensions.h"
+#include "../gui/CGuiHandler.h"
+
+#include "../widgets/CAnimation.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+#include "../../lib/BattleState.h"
+#include "../../lib/CArtHandler.h"
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CCreatureSet.h"
+#include "../../lib/CGameState.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CSpellHandler.h"
+#include "../../lib/IBonusTypeHandler.h"
+#include "../../lib/NetPacksBase.h"
 
 using namespace CSDL_Ext;
 

client/CCreatureWindow.h → client/windows/CCreatureWindow.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "gui/CIntObject.h"
-#include "../lib/HeroBonus.h"
-#include "gui/CArtifactHolder.h"
+#include "../../lib/HeroBonus.h"
+#include "../gui/CIntObject.h"
+#include "../widgets/CArtifactHolder.h"
 
 /*
  * CCreatureWindow.h, part of VCMI engine

client/CHeroWindow.cpp → client/windows/CHeroWindow.cpp

@@ -1,36 +1,35 @@
 #include "StdInc.h"
+#include "CHeroWindow.h"
 
-#include "CAnimation.h"
 #include "CAdvmapInterface.h"
-#include "../CCallback.h"
-#include "CGameInfo.h"
-#include "CHeroWindow.h"
-#include "CMessage.h"
-#include "CKingdomInterface.h"
 #include "CCreatureWindow.h"
-#include "SDL.h"
-#include "gui/SDL_Extensions.h"
-#include "CBitmapHandler.h"
-#include "Graphics.h"
+#include "CKingdomInterface.h"
 #include "CSpellWindow.h"
-#include "../lib/CConfigHandler.h"
-#include "CPlayerInterface.h"
+#include "GUIClasses.h"
+
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMT.h"
+#include "../CPlayerInterface.h"
+#include "../Graphics.h"
+
+#include "../gui/SDL_Extensions.h"
+#include "../gui/CGuiHandler.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
 
 #include "../lib/CArtHandler.h"
-#include "CDefHandler.h"
+#include "../lib/CConfigHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
 #include "../lib/mapObjects/CGHeroInstance.h"
 #include "../lib/NetPacksBase.h"
 
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
-#include "GUIClasses.h"
-#include "CMT.h"
-
-#undef min
-
 /*
  * CHeroWindow.cpp, part of VCMI engine
  *

client/CHeroWindow.h → client/windows/CHeroWindow.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../lib/HeroBonus.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/CArtifactHolder.h"
-#include "gui/CGarrisonInt.h"
+#include "../../lib/HeroBonus.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/CArtifactHolder.h"
+#include "../widgets/CGarrisonInt.h"
 
 /*
  * CHeroWindow.h, part of VCMI engine

client/CKingdomInterface.cpp → client/windows/CKingdomInterface.cpp

@@ -1,23 +1,26 @@
 #include "StdInc.h"
 #include "CKingdomInterface.h"
 
-#include "../CCallback.h"
-#include "../lib/CCreatureHandler.h" //creatures name for objects list
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CModHandler.h" //for buildings per turn
-#include "../lib/mapObjects/CGHeroInstance.h"
-#include "../lib/CHeroHandler.h" // only for calculating required xp? worth it?
-#include "../lib/CTownHandler.h"
-#include "CAnimation.h" //CAnimImage
-#include "CAdvmapInterface.h" //CResDataBar
-#include "CCastleInterface.h" //various town-specific classes
-#include "../lib/CConfigHandler.h"
-#include "CGameInfo.h"
-#include "CPlayerInterface.h" //LOCPLINT
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/MiscWidgets.h"
-#include "CMT.h"
+#include "CAdvmapInterface.h"
+#include "CCastleInterface.h"
+
+#include "../CGameInfo.h"
+#include "../CMT.h"
+#include "../CPlayerInterface.h"
+#include "../gui/CGuiHandler.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CCreatureHandler.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CTownHandler.h"
+#include "../../lib/mapObjects/CGHeroInstance.h"
 
 /*
  * CKingdomInterface.cpp, part of VCMI engine

client/CKingdomInterface.h → client/windows/CKingdomInterface.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "gui/CArtifactHolder.h"
-#include "gui/CGarrisonInt.h"
+#include "../widgets/CArtifactHolder.h"
+#include "../widgets/CGarrisonInt.h"
 
 class CAdventureMapButton;
 class CAnimImage;

client/CQuestLog.cpp → client/windows/CQuestLog.cpp

@@ -1,24 +1,24 @@
 #include "StdInc.h"
 #include "CQuestLog.h"
 
-#include "CGameInfo.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../CCallback.h"
-
-#include "CBitmapHandler.h"
-#include "CDefHandler.h"
-#include "Graphics.h"
-#include "CPlayerInterface.h"
 #include "CAdvmapInterface.h"
 
-#include "../lib/CGameState.h"
-#include "../lib/CArtHandler.h"
-#include "../lib/NetPacksBase.h"
-#include "../lib/CConfigHandler.h"
-
-#include "gui/CGuiHandler.h"
-#include "gui/CIntObjectClasses.h"
-#include "gui/SDL_Extensions.h"
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CPlayerInterface.h"
+#include "../Graphics.h"
+
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/CIntObjectClasses.h"
+
+#include "../../CCallback.h"
+#include "../../lib/CArtHandler.h"
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CGameState.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/NetPacksBase.h"
 
 /*
  * CQuestLog.cpp, part of VCMI engine

client/CQuestLog.h → client/windows/CQuestLog.h

@@ -1,12 +1,8 @@
 #pragma once
 
-#include "gui/CIntObjectClasses.h"
-#include "CAnimation.h"
-#include "AdventureMapClasses.h"
-//#include "CAdvmapInterface.h"
-//
-
-//#include "../lib/CGameState.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/CAnimation.h"
+#include "../widgets/AdventureMapClasses.h"
 
 /*
  * CQuestLog.h, part of VCMI engine

client/CSpellWindow.cpp → client/windows/CSpellWindow.cpp

@@ -1,28 +1,32 @@
 #include "StdInc.h"
 #include "CSpellWindow.h"
 
-#include "Graphics.h"
-#include "CDefHandler.h"
-#include "../lib/CConfigHandler.h"
-#include "../lib/CSpellHandler.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "CVideoHandler.h"
 #include "CAdvmapInterface.h"
-#include "battle/CBattleInterface.h"
-#include "CGameInfo.h"
-#include "gui/SDL_Extensions.h"
-#include "CMessage.h"
-#include "CPlayerInterface.h"
-#include "../CCallback.h"
-#include "CBitmapHandler.h"
-#include "../lib/CHeroHandler.h"
-#include "../lib/BattleState.h"
-#include "../lib/GameConstants.h"
-#include "gui/CGuiHandler.h"
-#include "gui/MiscWidgets.h"
-#include "CMT.h"
 #include "GUIClasses.h"
 
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMT.h"
+#include "../CPlayerInterface.h"
+#include "../CVideoHandler.h"
+#include "../Graphics.h"
+
+#include "../battle/CBattleInterface.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+
+#include "../../lib/BattleState.h"
+#include "../../lib/CConfigHandler.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CSpellHandler.h"
+#include "../../lib/GameConstants.h"
+
 /*
  * CSpellWindow.cpp, part of VCMI engine
  *

client/CSpellWindow.h → client/windows/CSpellWindow.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "gui/CIntObject.h"
-#include "gui/CIntObjectClasses.h"
+#include "../gui/CIntObject.h"
+#include "../widgets/CIntObjectClasses.h"
 
 /*
  * CSpellWindow.h, part of VCMI engine

client/gui/CTradeWindow.cpp → client/windows/CTradeWindow.cpp

@@ -1,11 +1,12 @@
 #include "StdInc.h"
 #include "CTradeWindow.h"
 
-#include "CGuiHandler.h"
-#include "CAnimation.h"
-#include "CCursorHandler.h"
+#include "CAdvmapInterface.h"
+
+#include "../gui/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
+#include "../widgets/CAnimation.h"
 
-#include "../CAdvmapInterface.h"
 #include "../CGameInfo.h"
 #include "../CPlayerInterface.h"
 

client/gui/CTradeWindow.h → client/windows/CTradeWindow.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CIntObjectClasses.h"
-#include "CArtifactHolder.h"
+#include "../widgets/CIntObjectClasses.h"
+#include "../widgets/CArtifactHolder.h"
 
 /*
  * CTradeWindow.h, part of VCMI engine

client/GUIClasses.cpp → client/windows/GUIClasses.cpp

@@ -1,49 +1,54 @@
 #include "StdInc.h"
 #include "GUIClasses.h"
-#include "gui/SDL_Extensions.h"
 
 #include "CAdvmapInterface.h"
-#include "CBitmapHandler.h"
-#include "CDefHandler.h"
-#include "battle/CBattleInterface.h"
-#include "battle/CBattleInterfaceClasses.h"
-#include "../CCallback.h"
 #include "CCastleInterface.h"
 #include "CCreatureWindow.h"
-#include "gui/CCursorHandler.h"
-#include "CGameInfo.h"
 #include "CHeroWindow.h"
-#include "CMessage.h"
-#include "../lib/CConfigHandler.h"
-#include "battle/CCreatureAnimation.h"
-#include "CPlayerInterface.h"
-#include "Graphics.h"
-#include "CAnimation.h"
+#include "CSpellWindow.h"
+
+#include "../CBitmapHandler.h"
+#include "../CDefHandler.h"
+#include "../CGameInfo.h"
+#include "../CMessage.h"
+#include "../CMusicHandler.h"
+#include "../CPlayerInterface.h"
+#include "../CPreGame.h"
+#include "../CVideoHandler.h"
+#include "../Graphics.h"
+#include "../mapHandler.h"
+
+#include "../battle/CBattleInterfaceClasses.h"
+#include "../battle/CBattleInterface.h"
+#include "../battle/CCreatureAnimation.h"
+
+#include "../gui/CGuiHandler.h"
+#include "../gui/SDL_Extensions.h"
+#include "../gui/CCursorHandler.h"
+
+#include "../widgets/CAnimation.h"
+#include "../widgets/MiscWidgets.h"
+
+#include "../../CCallback.h"
+
+#include "../lib/BattleState.h"
 #include "../lib/CArtHandler.h"
 #include "../lib/CBuildingHandler.h"
+#include "../lib/CConfigHandler.h"
+#include "../lib/CCreatureHandler.h"
+#include "../lib/CGameState.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
 #include "../lib/CModHandler.h"
+#include "../lib/CondSh.h"
 #include "../lib/CSpellHandler.h"
+#include "../lib/CStopWatch.h"
 #include "../lib/CTownHandler.h"
-#include "../lib/CondSh.h"
+#include "../lib/GameConstants.h"
+#include "../lib/HeroBonus.h"
 #include "../lib/mapping/CMap.h"
-#include "mapHandler.h"
-#include "../lib/CStopWatch.h"
 #include "../lib/NetPacksBase.h"
-#include "CSpellWindow.h"
-#include "CHeroWindow.h"
-#include "CVideoHandler.h"
 #include "../lib/StartInfo.h"
-#include "CPreGame.h"
-#include "../lib/HeroBonus.h"
-#include "../lib/CCreatureHandler.h"
-#include "CMusicHandler.h"
-#include "../lib/BattleState.h"
-#include "../lib/CGameState.h"
-#include "../lib/GameConstants.h"
-#include "gui/CGuiHandler.h"
-#include "gui/MiscWidgets.h"
 
 /*
  * GUIClasses.cpp, part of VCMI engine

client/GUIClasses.h → client/windows/GUIClasses.h

@@ -3,9 +3,9 @@
 #include "../lib/GameConstants.h"
 #include "../lib/ResourceSet.h"
 #include "../lib/CConfigHandler.h"
-#include "gui/CArtifactHolder.h"
-#include "gui/CGarrisonInt.h"
-#include "CAnimation.h"
+#include "../widgets/CArtifactHolder.h"
+#include "../widgets/CGarrisonInt.h"
+#include "../widgets/CAnimation.h"
 
 /*
  * GUIClasses.h, part of VCMI engine