games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
beegee1 2013-04-07 11:52:07 +00:00
parent ee51c5beb5
commit 30bcec42c6
57 changed files with 144 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/AdventureMapClasses.cpp
View File

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

4
client/AdventureMapClasses.h
View File

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

8
client/CAdvmapInterface.cpp
View File

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

2
client/CAdvmapInterface.h
View File

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

4
client/CAnimation.cpp
View File

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

2
client/CAnimation.h
View File

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

2
client/CBitmapHandler.cpp
View File

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

6
client/CCastleInterface.cpp
View File

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

6
client/CCreatureWindow.cpp
View File

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

2
client/CCreatureWindow.h
View File

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

6
client/CHeroWindow.cpp
View File

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

2
client/CHeroWindow.h
View File

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

4
client/CKingdomInterface.cpp
View File

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

6
client/CMT.cpp
View File

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

22
client/CMakeLists.txt
View File

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

4
client/CMessage.cpp
View File

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

2
client/CMessage.h
View File

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

14
client/CPlayerInterface.cpp
View File

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

2
client/CPlayerInterface.h
View File

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

8
client/CPreGame.cpp
View File

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

6
client/CQuestLog.cpp
View File

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

2
client/CQuestLog.h
View File

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

6
client/CSpellWindow.cpp
View File

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

4
client/CSpellWindow.h
View File

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

4
client/CVideoHandler.cpp
View File

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

4
client/Client.cpp
View File

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

12
client/GUIClasses.cpp
View File

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

4
client/GUIClasses.h
View File

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

2
client/Graphics.cpp
View File

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

4
client/Graphics.h
View File

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

6
client/NetPacksClient.cpp
View File

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

46
client/VCMI_client.cbp
View File

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

48
client/VCMI_client.vcxproj
View File

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

4
client/BattleInterface/CBattleAnimations.cpp → client/battle/CBattleAnimations.cpp
View File

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

0
client/BattleInterface/CBattleAnimations.h → client/battle/CBattleAnimations.h
View File

6
client/BattleInterface/CBattleInterface.cpp → client/battle/CBattleInterface.cpp
View File

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

0
client/BattleInterface/CBattleInterface.h → client/battle/CBattleInterface.h
View File

8
client/BattleInterface/CBattleInterfaceClasses.cpp → client/battle/CBattleInterfaceClasses.cpp
View File

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

2
client/BattleInterface/CBattleInterfaceClasses.h → client/battle/CBattleInterfaceClasses.h
View File

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

4
client/BattleInterface/CCreatureAnimation.cpp → client/battle/CCreatureAnimation.cpp
View File

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

0
client/BattleInterface/CCreatureAnimation.h → client/battle/CCreatureAnimation.h
View File

0
client/UIFramework/CCursorHandler.cpp → client/gui/CCursorHandler.cpp
View File

0
client/UIFramework/CCursorHandler.h → client/gui/CCursorHandler.h
View File

0
client/UIFramework/CGuiHandler.cpp → client/gui/CGuiHandler.cpp
View File

0
client/UIFramework/CGuiHandler.h → client/gui/CGuiHandler.h
View File

0
client/UIFramework/CIntObject.cpp → client/gui/CIntObject.cpp
View File

0
client/UIFramework/CIntObject.h → client/gui/CIntObject.h
View File

4
client/UIFramework/CIntObjectClasses.cpp → client/gui/CIntObjectClasses.cpp
View File

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

0
client/UIFramework/CIntObjectClasses.h → client/gui/CIntObjectClasses.h
View File

0
client/UIFramework/Fonts.cpp → client/gui/Fonts.cpp
View File

0
client/UIFramework/Fonts.h → client/gui/Fonts.h
View File

0
client/UIFramework/Geometries.cpp → client/gui/Geometries.cpp
View File

0
client/UIFramework/Geometries.h → client/gui/Geometries.h
View File

0
client/UIFramework/SDL_Extensions.cpp → client/gui/SDL_Extensions.cpp
View File

0
client/UIFramework/SDL_Extensions.h → client/gui/SDL_Extensions.h
View File

0
client/UIFramework/SDL_Pixels.h → client/gui/SDL_Pixels.h
View File

2
client/mapHandler.cpp
View File

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