games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-31 22:05:10 +02:00
Code Issues Releases Activity

- Moved FunctionList from /client to /lib -> used in client and server

Browse Source 
- Updated project files
This commit is contained in:
beegee1 2013-11-30 10:08:38 +00:00
parent c786a3076a
commit 41e274b4aa
13 changed files with 102 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/CMakeLists.txt
View File

@ -48,7 +48,6 @@ set(client_SRCS
set(client_HEADERS
CSoundBase.h
FunctionList.h
gui/SDL_Pixels.h
)

2
client/CPlayerInterface.h
View File

@ -2,7 +2,7 @@
#include "../lib/CondSh.h"
#include "FunctionList.h"
#include "../lib/FunctionList.h"
#include "../lib/CGameInterface.h"
#include "gui/CIntObject.h"
#include "../lib/CGameState.h"

2
client/CPreGame.h
View File

@ -4,7 +4,7 @@
#include <SDL.h>
#include "../lib/StartInfo.h"
#include "GUIClasses.h"
#include "FunctionList.h"
#include "../lib/FunctionList.h"
#include "../lib/mapping/CMapInfo.h"
#include "../lib/rmg/CMapGenerator.h"

2
client/GUIClasses.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "CAnimation.h"
#include "FunctionList.h"
#include "../lib/FunctionList.h"
#include "../lib/ResourceSet.h"
#include "../lib/CConfigHandler.h"
#include "../lib/GameConstants.h"

1
client/VCMI_client.vcxproj
View File

@ -231,7 +231,6 @@
<ClInclude Include="CSpellWindow.h" />
<ClInclude Include="CVideoHandler.h" />
<ClInclude Include="FontBase.h" />
<ClInclude Include="FunctionList.h" />
<ClInclude Include="Graphics.h" />
<ClInclude Include="GUIClasses.h" />
<ClInclude Include="mapHandler.h" />

1
client/VCMI_client.vcxproj.filters
View File

@ -60,7 +60,6 @@
<ClInclude Include="CSpellWindow.h" />
<ClInclude Include="CVideoHandler.h" />
<ClInclude Include="FontBase.h" />
<ClInclude Include="FunctionList.h" />
<ClInclude Include="Graphics.h" />
<ClInclude Include="GUIClasses.h" />
<ClInclude Include="resource.h" />

2
client/battle/CCreatureAnimation.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "../FunctionList.h"
#include "../../lib/FunctionList.h"
//#include "../CDefHandler.h"
#include "../CAnimation.h"

2
client/gui/CIntObjectClasses.h
View File

@ -2,7 +2,7 @@
#include "CIntObject.h"
#include "SDL_Extensions.h"
#include "../FunctionList.h"
#include "../../lib/FunctionList.h"
struct SDL_Surface;
struct Rect;

3
lib/CMakeLists.txt
View File

@ -73,8 +73,10 @@ set(lib_SRCS
set(lib_HEADERS
../Global.h
filesystem/CInputStream.h
filesystem/ISimpleResourceLoader.h
AI_Base.h
CondSh.h
ConstTransitivePtr.h
@ -82,6 +84,7 @@ set(lib_HEADERS
CRandomGenerator.h
CScriptingModule.h
CStopWatch.h
FunctionList.h
GameConstants.h
StringConstants.h
IGameEventsReceiver.h

0
client/FunctionList.h → lib/FunctionList.h
View File

1
lib/VCMI_lib.vcxproj
View File

@ -272,6 +272,7 @@
<ClInclude Include="filesystem\CZipLoader.h" />
<ClInclude Include="filesystem\Filesystem.h" />
<ClInclude Include="filesystem\ISimpleResourceLoader.h" />
<ClInclude Include="FunctionList.h" />
<ClInclude Include="IBonusTypeHandler.h" />
<ClInclude Include="mapping\CCampaignHandler.h" />
<ClInclude Include="mapping\CMap.h" />

3
lib/VCMI_lib.vcxproj.filters
View File

@ -231,6 +231,9 @@
<ClInclude Include="Filesystem\CCompressedStream.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FunctionList.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CModHandler.h">
<Filter>Header Files</Filter>
</ClInclude>

2
server/CGameHandler.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "../client/FunctionList.h"
#include "../lib/FunctionList.h"
#include "../lib/CGameState.h"
#include "../lib/Connection.h"
#include "../lib/IGameCallback.h"