- Renamed client/BattleInterface to client/battle and client/UIFramework to client/gui

client/AdventureMapClasses.cpp

@@ -20,8 +20,8 @@
 #include "CMusicHandler.h"
 #include "Graphics.h"
 #include "GUIClasses.h"
-#include "UIFramework/CGuiHandler.h"
-#include "UIFramework/SDL_Pixels.h"
+#include "gui/CGuiHandler.h"
+#include "gui/SDL_Pixels.h"
 
 /*
  * CAdventureMapClasses.h, part of VCMI engine

client/AdventureMapClasses.h

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

client/CAdvmapInterface.cpp

@@ -3,13 +3,13 @@
 
 #include "../CCallback.h"
 #include "CCastleInterface.h"
-#include "UIFramework/CCursorHandler.h"
+#include "gui/CCursorHandler.h"
 #include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CKingdomInterface.h"
 #include "CMessage.h"
 #include "CPlayerInterface.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "CBitmapHandler.h"
 #include "../lib/CConfigHandler.h"
 #include "CSpellWindow.h"
@@ -28,8 +28,8 @@
 #include "CSoundBase.h"
 #include "../lib/CGameState.h"
 #include "CMusicHandler.h"
-#include "UIFramework/CGuiHandler.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CGuiHandler.h"
+#include "gui/CIntObjectClasses.h"
 #include "../lib/UnlockGuard.h"
 
 #ifdef _MSC_VER

client/CAdvmapInterface.h

@@ -3,7 +3,7 @@
 #include <typeinfo>
 
 #include "SDL.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CIntObjectClasses.h"
 #include "GUIClasses.h"
 #include "AdventureMapClasses.h"
 

client/CAnimation.cpp

@@ -8,8 +8,8 @@
 #include "CBitmapHandler.h"
 #include "Graphics.h"
 #include "CAnimation.h"
-#include "UIFramework/SDL_Extensions.h"
-#include "UIFramework/SDL_Pixels.h"
+#include "gui/SDL_Extensions.h"
+#include "gui/SDL_Pixels.h"
 
 /*
  * CAnimation.cpp, part of VCMI engine

client/CAnimation.h

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

client/CBitmapHandler.cpp

@@ -6,7 +6,7 @@
 #include "SDL_image.h"
 #include "CBitmapHandler.h"
 #include "CDefHandler.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "../lib/vcmi_endian.h"
 
 /*

client/CCastleInterface.cpp

@@ -20,10 +20,10 @@
 #include "CMusicHandler.h"
 #include "CPlayerInterface.h"
 #include "Graphics.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "../lib/GameConstants.h"
-#include "UIFramework/CGuiHandler.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CGuiHandler.h"
+#include "gui/CIntObjectClasses.h"
 
 using namespace boost::assign;
 

client/CCreatureWindow.cpp

@@ -8,7 +8,7 @@
 #include "../CCallback.h"
 
 #include <SDL.h>
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "CBitmapHandler.h"
 #include "CDefHandler.h"
 #include "Graphics.h"
@@ -24,8 +24,8 @@
 #include "../lib/CModHandler.h"
 #include "../lib/IBonusTypeHandler.h"
 
-#include "UIFramework/CGuiHandler.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CGuiHandler.h"
+#include "gui/CIntObjectClasses.h"
 
 using namespace CSDL_Ext;
 

client/CCreatureWindow.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "UIFramework/CIntObject.h"
+#include "gui/CIntObject.h"
 #include "../lib/HeroBonus.h"
 #include "GUIClasses.h"
 

client/CHeroWindow.cpp

@@ -9,7 +9,7 @@
 #include "CKingdomInterface.h"
 #include "CCreatureWindow.h"
 #include "SDL.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "CBitmapHandler.h"
 #include "Graphics.h"
 #include "CSpellWindow.h"
@@ -23,8 +23,8 @@
 #include "../lib/CObjectHandler.h"
 #include "../lib/NetPacks.h"
 
-#include "UIFramework/CGuiHandler.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CGuiHandler.h"
+#include "gui/CIntObjectClasses.h"
 #include "CMT.h"
 
 #undef min

client/CHeroWindow.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../lib/HeroBonus.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CIntObjectClasses.h"
 #include "GUIClasses.h"
 
 //#include "CPlayerInterface.h"

client/CKingdomInterface.cpp

@@ -14,8 +14,8 @@
 #include "../lib/CConfigHandler.h"
 #include "CGameInfo.h"
 #include "CPlayerInterface.h" //LOCPLINT
-#include "UIFramework/CGuiHandler.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CGuiHandler.h"
+#include "gui/CIntObjectClasses.h"
 #include "CMT.h"
 
 /*

client/CMT.cpp

@@ -3,7 +3,7 @@
 #include "StdInc.h"
 #include <boost/filesystem/operations.hpp>
 #include <SDL_mixer.h>
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "CGameInfo.h"
 #include "mapHandler.h"
 
@@ -11,7 +11,7 @@
 #include "CPreGame.h"
 #include "CCastleInterface.h"
 #include "../lib/CConsoleHandler.h"
-#include "UIFramework/CCursorHandler.h"
+#include "gui/CCursorHandler.h"
 #include "../lib/CGameState.h"
 #include "../CCallback.h"
 #include "CPlayerInterface.h"
@@ -38,7 +38,7 @@
 #include "../lib/CArtHandler.h"
 #include "../lib/CScriptingModule.h"
 #include "../lib/GameConstants.h"
-#include "UIFramework/CGuiHandler.h"
+#include "gui/CGuiHandler.h"
 
 #ifdef _WIN32
 #include "SDL_syswm.h"

client/CMakeLists.txt

@@ -7,17 +7,17 @@ include_directories(${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${FFMPEG_INCLUDE_D
 
 set(client_SRCS
         ../CCallback.cpp
-        BattleInterface/CBattleAnimations.cpp
-        BattleInterface/CBattleInterface.cpp
-        BattleInterface/CBattleInterfaceClasses.cpp
-        BattleInterface/CCreatureAnimation.cpp
-        UIFramework/CGuiHandler.cpp
-        UIFramework/CIntObject.cpp
-        UIFramework/CIntObjectClasses.cpp
-        UIFramework/Fonts.cpp
-        UIFramework/Geometries.cpp
-        UIFramework/CCursorHandler.cpp
-        UIFramework/SDL_Extensions.cpp
+        battle/CBattleAnimations.cpp
+        battle/CBattleInterface.cpp
+        battle/CBattleInterfaceClasses.cpp
+        battle/CCreatureAnimation.cpp
+        gui/CGuiHandler.cpp
+        gui/CIntObject.cpp
+        gui/CIntObjectClasses.cpp
+        gui/Fonts.cpp
+        gui/Geometries.cpp
+        gui/CCursorHandler.cpp
+        gui/SDL_Extensions.cpp
         AdventureMapClasses.cpp
         CAdvmapInterface.cpp
         CAnimation.cpp

client/CMessage.cpp

@@ -5,13 +5,13 @@
 #include "CDefHandler.h"
 #include "CAnimation.h"
 #include "CGameInfo.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "Graphics.h"
 #include "GUIClasses.h"
 #include "../lib/CConfigHandler.h"
 #include "CBitmapHandler.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CIntObjectClasses.h"
 
 /*
  * CMessage.cpp, part of VCMI engine

client/CMessage.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Graphics.h"
-#include "UIFramework/Geometries.h"
+#include "gui/Geometries.h"
 
 
 /*

client/CPlayerInterface.cpp

@@ -1,11 +1,11 @@
 #include "StdInc.h"
 
 #include "CAdvmapInterface.h"
-#include "BattleInterface/CBattleInterface.h"
-#include "BattleInterface/CBattleInterfaceClasses.h"
+#include "battle/CBattleInterface.h"
+#include "battle/CBattleInterfaceClasses.h"
 #include "../CCallback.h"
 #include "CCastleInterface.h"
-#include "UIFramework/CCursorHandler.h"
+#include "gui/CCursorHandler.h"
 #include "CKingdomInterface.h"
 #include "CGameInfo.h"
 #include "CHeroWindow.h"
@@ -13,10 +13,10 @@
 #include "CQuestLog.h"
 #include "CMessage.h"
 #include "CPlayerInterface.h"
-//#include "UIFramework/SDL_Extensions.h"
-#include "UIFramework/SDL_Extensions.h"
+//#include "gui/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "../lib/CConfigHandler.h"
-#include "BattleInterface/CCreatureAnimation.h"
+#include "battle/CCreatureAnimation.h"
 #include "Graphics.h"
 #include "../lib/CArtHandler.h"
 #include "../lib/CGeneralTextHandler.h"
@@ -37,7 +37,7 @@
 #include "../lib/StartInfo.h"
 #include "../lib/CGameState.h"
 #include "../lib/GameConstants.h"
-#include "UIFramework/CGuiHandler.h"
+#include "gui/CGuiHandler.h"
 #include "../lib/UnlockGuard.h"
 
 #ifdef min

client/CPlayerInterface.h

@@ -4,7 +4,7 @@
 #include "../lib/CondSh.h"
 #include "FunctionList.h"
 #include "../lib/CGameInterface.h"
-#include "UIFramework/CIntObject.h"
+#include "gui/CIntObject.h"
 #include "../lib/CGameState.h"
 
 #ifdef __GNUC__

client/CPreGame.cpp

@@ -6,9 +6,9 @@
 #include "../lib/filesystem/CCompressedStream.h"
 
 #include "../lib/CStopWatch.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "CGameInfo.h"
-#include "UIFramework/CCursorHandler.h"
+#include "gui/CCursorHandler.h"
 #include "CAnimation.h"
 #include "CDefHandler.h"
 #include "../lib/CDefObjInfoHandler.h"
@@ -39,8 +39,8 @@
 #include "../lib/CThreadHelper.h"
 #include "../lib/CConfigHandler.h"
 #include "../lib/GameConstants.h"
-#include "UIFramework/CGuiHandler.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CGuiHandler.h"
+#include "gui/CIntObjectClasses.h"
 #include "../lib/mapping/CMapService.h"
 
 /*

client/CQuestLog.cpp

@@ -6,7 +6,7 @@
 #include "../CCallback.h"
 
 #include <SDL.h>
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "CBitmapHandler.h"
 #include "CDefHandler.h"
 #include "Graphics.h"
@@ -18,8 +18,8 @@
 #include "../lib/NetPacks.h"
 #include "../lib/CObjectHandler.h"
 
-#include "UIFramework/CGuiHandler.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CGuiHandler.h"
+#include "gui/CIntObjectClasses.h"
 
 /*
  * CQuestLog.cpp, part of VCMI engine

client/CQuestLog.h

@@ -1,4 +1,4 @@
-#include "UIFramework/CIntObject.h"
+#include "gui/CIntObject.h"
 #include "AdventureMapClasses.h"
 #include "CAdvmapInterface.h"
 #include "GUIClasses.h"

client/CSpellWindow.cpp

@@ -8,9 +8,9 @@
 #include "../lib/CGeneralTextHandler.h"
 #include "CVideoHandler.h"
 #include "CAdvmapInterface.h"
-#include "BattleInterface/CBattleInterface.h"
+#include "battle/CBattleInterface.h"
 #include "CGameInfo.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "CMessage.h"
 #include "CPlayerInterface.h"
 #include "../CCallback.h"
@@ -18,7 +18,7 @@
 #include "../lib/CHeroHandler.h"
 #include "../lib/BattleState.h"
 #include "../lib/GameConstants.h"
-#include "UIFramework/CGuiHandler.h"
+#include "gui/CGuiHandler.h"
 #include "CMT.h"
 
 /*

client/CSpellWindow.h

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

client/CVideoHandler.cpp

@@ -2,8 +2,8 @@
 #include <SDL.h>
 #include "CVideoHandler.h"
 
-#include "UIFramework/CGuiHandler.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/CGuiHandler.h"
+#include "gui/SDL_Extensions.h"
 #include "CPlayerInterface.h"
 #include "../lib/filesystem/CResourceLoader.h"
 

client/Client.cpp

@@ -29,11 +29,11 @@
 #include "../lib/CConfigHandler.h"
 #include "Client.h"
 #include "CPreGame.h"
-#include "BattleInterface/CBattleInterface.h"
+#include "battle/CBattleInterface.h"
 #include "../lib/CThreadHelper.h"
 #include "../lib/CScriptingModule.h"
 #include "../lib/RegisterTypes.h"
-#include "UIFramework/CGuiHandler.h"
+#include "gui/CGuiHandler.h"
 
 extern std::string NAME;
 namespace intpr = boost::interprocess;

client/GUIClasses.cpp

@@ -1,19 +1,19 @@
 #include "StdInc.h"
 #include "GUIClasses.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 
 #include "CAdvmapInterface.h"
-#include "BattleInterface/CBattleInterface.h"
-#include "BattleInterface/CBattleInterfaceClasses.h"
+#include "battle/CBattleInterface.h"
+#include "battle/CBattleInterfaceClasses.h"
 #include "../CCallback.h"
 #include "CCastleInterface.h"
 #include "CCreatureWindow.h"
-#include "UIFramework/CCursorHandler.h"
+#include "gui/CCursorHandler.h"
 #include "CGameInfo.h"
 #include "CHeroWindow.h"
 #include "CMessage.h"
 #include "../lib/CConfigHandler.h"
-#include "BattleInterface/CCreatureAnimation.h"
+#include "battle/CCreatureAnimation.h"
 #include "CPlayerInterface.h"
 #include "Graphics.h"
 #include "CAnimation.h"
@@ -41,7 +41,7 @@
 #include "../lib/BattleState.h"
 #include "../lib/CGameState.h"
 #include "../lib/GameConstants.h"
-#include "UIFramework/CGuiHandler.h"
+#include "gui/CGuiHandler.h"
 
 /*
  * GUIClasses.cpp, part of VCMI engine

client/GUIClasses.h

@@ -5,8 +5,8 @@
 #include "../lib/ResourceSet.h"
 #include "../lib/CConfigHandler.h"
 #include "../lib/GameConstants.h"
-#include "UIFramework/CIntObject.h"
-#include "UIFramework/CIntObjectClasses.h"
+#include "gui/CIntObject.h"
+#include "gui/CIntObjectClasses.h"
 #include "../lib/GameConstants.h"
 
 #ifdef max

client/Graphics.cpp

@@ -3,7 +3,7 @@
 
 #include "../lib/filesystem/CResourceLoader.h"
 #include "CDefHandler.h"
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include <SDL_ttf.h>
 #include "../lib/CThreadHelper.h"
 #include "CGameInfo.h"

client/Graphics.h

@@ -1,9 +1,9 @@
 #pragma once
 
 
-#include "UIFramework/Fonts.h"
+#include "gui/Fonts.h"
 #include "../lib/GameConstants.h"
-#include "UIFramework/Geometries.h"
+#include "gui/Geometries.h"
 
 /*
  * Graphics.h, part of VCMI engine

client/NetPacksClient.cpp

@@ -20,13 +20,13 @@
 #include "mapHandler.h"
 #include "GUIClasses.h"
 #include "../lib/CConfigHandler.h"
-#include "UIFramework/SDL_Extensions.h"
-#include "BattleInterface/CBattleInterface.h"
+#include "gui/SDL_Extensions.h"
+#include "battle/CBattleInterface.h"
 #include "../lib/mapping/CCampaignHandler.h"
 #include "../lib/CGameState.h"
 #include "../lib/BattleState.h"
 #include "../lib/GameConstants.h"
-#include "UIFramework/CGuiHandler.h"
+#include "gui/CGuiHandler.h"
 
 //macros to avoid code duplication - calls given method with given arguments if interface for specific player is present
 //awaiting variadic templates...

client/VCMI_client.cbp

@@ -71,14 +71,14 @@
 		<Unit filename="../CCallback.h" />
 		<Unit filename="AdventureMapClasses.cpp" />
 		<Unit filename="AdventureMapClasses.h" />
-		<Unit filename="BattleInterface/CBattleAnimations.cpp" />
-		<Unit filename="BattleInterface/CBattleAnimations.h" />
-		<Unit filename="BattleInterface/CBattleInterface.cpp" />
-		<Unit filename="BattleInterface/CBattleInterface.h" />
-		<Unit filename="BattleInterface/CBattleInterfaceClasses.cpp" />
-		<Unit filename="BattleInterface/CBattleInterfaceClasses.h" />
-		<Unit filename="BattleInterface/CCreatureAnimation.cpp" />
-		<Unit filename="BattleInterface/CCreatureAnimation.h" />
+		<Unit filename="battle/CBattleAnimations.cpp" />
+		<Unit filename="battle/CBattleAnimations.h" />
+		<Unit filename="battle/CBattleInterface.cpp" />
+		<Unit filename="battle/CBattleInterface.h" />
+		<Unit filename="battle/CBattleInterfaceClasses.cpp" />
+		<Unit filename="battle/CBattleInterfaceClasses.h" />
+		<Unit filename="battle/CCreatureAnimation.cpp" />
+		<Unit filename="battle/CCreatureAnimation.h" />
 		<Unit filename="CAdvmapInterface.cpp" />
 		<Unit filename="CAdvmapInterface.h" />
 		<Unit filename="CAnimation.cpp" />
@@ -125,21 +125,21 @@
 			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
-		<Unit filename="UIFramework/CCursorHandler.cpp" />
-		<Unit filename="UIFramework/CCursorHandler.h" />
-		<Unit filename="UIFramework/CGuiHandler.cpp" />
-		<Unit filename="UIFramework/CGuiHandler.h" />
-		<Unit filename="UIFramework/CIntObject.cpp" />
-		<Unit filename="UIFramework/CIntObject.h" />
-		<Unit filename="UIFramework/CIntObjectClasses.cpp" />
-		<Unit filename="UIFramework/CIntObjectClasses.h" />
-		<Unit filename="UIFramework/Fonts.cpp" />
-		<Unit filename="UIFramework/Fonts.h" />
-		<Unit filename="UIFramework/Geometries.cpp" />
-		<Unit filename="UIFramework/Geometries.h" />
-		<Unit filename="UIFramework/SDL_Extensions.cpp" />
-		<Unit filename="UIFramework/SDL_Extensions.h" />
-		<Unit filename="UIFramework/SDL_Pixels.h" />
+		<Unit filename="gui/CCursorHandler.cpp" />
+		<Unit filename="gui/CCursorHandler.h" />
+		<Unit filename="gui/CGuiHandler.cpp" />
+		<Unit filename="gui/CGuiHandler.h" />
+		<Unit filename="gui/CIntObject.cpp" />
+		<Unit filename="gui/CIntObject.h" />
+		<Unit filename="gui/CIntObjectClasses.cpp" />
+		<Unit filename="gui/CIntObjectClasses.h" />
+		<Unit filename="gui/Fonts.cpp" />
+		<Unit filename="gui/Fonts.h" />
+		<Unit filename="gui/Geometries.cpp" />
+		<Unit filename="gui/Geometries.h" />
+		<Unit filename="gui/SDL_Extensions.cpp" />
+		<Unit filename="gui/SDL_Extensions.h" />
+		<Unit filename="gui/SDL_Pixels.h" />
 		<Unit filename="VCMI_client.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>

client/VCMI_client.vcxproj

@@ -161,10 +161,10 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="AdventureMapClasses.cpp" />
-    <ClCompile Include="BattleInterface\CBattleAnimations.cpp" />
-    <ClCompile Include="BattleInterface\CBattleInterface.cpp" />
-    <ClCompile Include="BattleInterface\CBattleInterfaceClasses.cpp" />
-    <ClCompile Include="BattleInterface\CCreatureAnimation.cpp" />
+    <ClCompile Include="battle\CBattleAnimations.cpp" />
+    <ClCompile Include="battle\CBattleInterface.cpp" />
+    <ClCompile Include="battle\CBattleInterfaceClasses.cpp" />
+    <ClCompile Include="battle\CCreatureAnimation.cpp" />
     <ClCompile Include="CAdvmapInterface.cpp" />
     <ClCompile Include="CAnimation.cpp" />
     <ClCompile Include="..\CCallback.cpp" />
@@ -195,21 +195,21 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='RD|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="UIFramework\CCursorHandler.cpp" />
-    <ClCompile Include="UIFramework\CGuiHandler.cpp" />
-    <ClCompile Include="UIFramework\CIntObject.cpp" />
-    <ClCompile Include="UIFramework\CIntObjectClasses.cpp" />
-    <ClCompile Include="UIFramework\Fonts.cpp" />
-    <ClCompile Include="UIFramework\Geometries.cpp" />
-    <ClCompile Include="UIFramework\SDL_Extensions.cpp" />
+    <ClCompile Include="gui\CCursorHandler.cpp" />
+    <ClCompile Include="gui\CGuiHandler.cpp" />
+    <ClCompile Include="gui\CIntObject.cpp" />
+    <ClCompile Include="gui\CIntObjectClasses.cpp" />
+    <ClCompile Include="gui\Fonts.cpp" />
+    <ClCompile Include="gui\Geometries.cpp" />
+    <ClCompile Include="gui\SDL_Extensions.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Global.h" />
     <ClInclude Include="AdventureMapClasses.h" />
-    <ClInclude Include="BattleInterface\CBattleAnimations.h" />
-    <ClInclude Include="BattleInterface\CBattleInterface.h" />
-    <ClInclude Include="BattleInterface\CBattleInterfaceClasses.h" />
-    <ClInclude Include="BattleInterface\CCreatureAnimation.h" />
+    <ClInclude Include="battle\CBattleAnimations.h" />
+    <ClInclude Include="battle\CBattleInterface.h" />
+    <ClInclude Include="battle\CBattleInterfaceClasses.h" />
+    <ClInclude Include="battle\CCreatureAnimation.h" />
     <ClInclude Include="CAdvmapInterface.h" />
     <ClInclude Include="CAnimation.h" />
     <ClInclude Include="CBitmapHandler.h" />
@@ -236,14 +236,14 @@
     <ClInclude Include="mapHandler.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="StdInc.h" />
-    <ClInclude Include="UIFramework\CCursorHandler.h" />
-    <ClInclude Include="UIFramework\CGuiHandler.h" />
-    <ClInclude Include="UIFramework\CIntObject.h" />
-    <ClInclude Include="UIFramework\CIntObjectClasses.h" />
-    <ClInclude Include="UIFramework\Fonts.h" />
-    <ClInclude Include="UIFramework\Geometries.h" />
-    <ClInclude Include="UIFramework\SDL_Extensions.h" />
-    <ClInclude Include="UIFramework\SDL_Pixels.h" />
+    <ClInclude Include="gui\CCursorHandler.h" />
+    <ClInclude Include="gui\CGuiHandler.h" />
+    <ClInclude Include="gui\CIntObject.h" />
+    <ClInclude Include="gui\CIntObjectClasses.h" />
+    <ClInclude Include="gui\Fonts.h" />
+    <ClInclude Include="gui\Geometries.h" />
+    <ClInclude Include="gui\SDL_Extensions.h" />
+    <ClInclude Include="gui\SDL_Pixels.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\ChangeLog" />
@@ -260,4 +260,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

client/BattleInterface/CBattleAnimations.cpp → client/battle/CBattleAnimations.cpp

@@ -10,9 +10,9 @@
 #include "../../lib/BattleState.h"
 #include "../CPlayerInterface.h"
 #include "../../CCallback.h"
-#include "../UIFramework/SDL_Extensions.h"
+#include "../gui/SDL_Extensions.h"
 #include "../Graphics.h"
-#include "../UIFramework/CCursorHandler.h"
+#include "../gui/CCursorHandler.h"
 #include "../../lib/CTownHandler.h"
 
 

client/BattleInterface/CBattleInterface.cpp → client/battle/CBattleInterface.cpp

@@ -2,7 +2,7 @@
 #include "CBattleInterface.h"
 
 #include "../CGameInfo.h"
-#include "../UIFramework/SDL_Extensions.h"
+#include "../gui/SDL_Extensions.h"
 #include "../CAdvmapInterface.h"
 #include "../CAnimation.h"
 #include "../../lib/CObjectHandler.h"
@@ -29,8 +29,8 @@
 #include "CBattleAnimations.h"
 #include "CBattleInterfaceClasses.h"
 
-#include "../UIFramework/CCursorHandler.h"
-#include "../UIFramework/CGuiHandler.h"
+#include "../gui/CCursorHandler.h"
+#include "../gui/CGuiHandler.h"
 #include "../CMT.h"
 
 #ifndef __GNUC__

client/BattleInterface/CBattleInterfaceClasses.cpp → client/battle/CBattleInterfaceClasses.cpp

@@ -1,18 +1,18 @@
 #include "StdInc.h"
 #include "CBattleInterfaceClasses.h"
 
-#include "../UIFramework/SDL_Extensions.h"
+#include "../gui/SDL_Extensions.h"
 #include "CBattleInterface.h"
 #include "../CGameInfo.h"
 #include "../CDefHandler.h"
-#include "../UIFramework/CCursorHandler.h"
+#include "../gui/CCursorHandler.h"
 #include "../CPlayerInterface.h"
 #include "../../CCallback.h"
 #include "../CSpellWindow.h"
 #include "../Graphics.h"
 #include "../../lib/CConfigHandler.h"
-#include "../UIFramework/CGuiHandler.h"
-#include "../UIFramework/CIntObjectClasses.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/CIntObjectClasses.h"
 #include "../../lib/CGeneralTextHandler.h"
 #include "../../lib/NetPacks.h"
 #include "../../lib/CCreatureHandler.h"

client/BattleInterface/CBattleInterfaceClasses.h → client/battle/CBattleInterfaceClasses.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../UIFramework/CIntObject.h"
+#include "../gui/CIntObject.h"
 
 struct SDL_Surface;
 class CDefHandler;

client/BattleInterface/CCreatureAnimation.cpp → client/battle/CCreatureAnimation.cpp

@@ -4,8 +4,8 @@
 #include "../../lib/filesystem/CResourceLoader.h"
 #include "../../lib/VCMI_Lib.h"
 #include "../../lib/vcmi_endian.h"
-#include "../UIFramework/SDL_Extensions.h"
-#include "../UIFramework/SDL_Pixels.h"
+#include "../gui/SDL_Extensions.h"
+#include "../gui/SDL_Pixels.h"
 
 /*
  * CCreatureAnimation.cpp, part of VCMI engine

client/UIFramework/CIntObjectClasses.cpp → client/gui/CIntObjectClasses.cpp

@@ -10,8 +10,8 @@
 #include "../CGameInfo.h"
 #include "../../CCallback.h"
 #include "../../lib/CConfigHandler.h"
-#include "../BattleInterface/CBattleInterface.h"
-#include "../BattleInterface/CBattleInterfaceClasses.h"
+#include "../battle/CBattleInterface.h"
+#include "../battle/CBattleInterfaceClasses.h"
 #include "../CPlayerInterface.h"
 #include "../CMessage.h"
 #include "../CMusicHandler.h"

client/mapHandler.cpp

@@ -1,7 +1,7 @@
 #include "StdInc.h"
 #include "mapHandler.h"
 
-#include "UIFramework/SDL_Extensions.h"
+#include "gui/SDL_Extensions.h"
 #include "CGameInfo.h"
 #include "../lib/CDefObjInfoHandler.h"
 #include "../lib/CGameState.h"