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

- Renamed /lib subfolders to lowercase

Browse Source
This commit is contained in:
beegee1 2013-04-07 10:48:07 +00:00
parent 89ad007b44
commit ee51c5beb5
87 changed files with 197 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AI/VCAI/VCAI.h
View File

@ -14,7 +14,7 @@
#include "../../lib/CObjectHandler.h" #include "../../lib/CObjectHandler.h"
#include "../../lib/Connection.h" #include "../../lib/Connection.h"
#include "../../lib/CGameState.h" #include "../../lib/CGameState.h"
#include "../../lib/Mapping/CMap.h" #include "../../lib/mapping/CMap.h"
#include "../../lib/NetPacks.h" #include "../../lib/NetPacks.h"
#include "../../lib/CondSh.h" #include "../../lib/CondSh.h"
#include "../../lib/CStopWatch.h" #include "../../lib/CStopWatch.h"

2
CCallback.cpp
View File

@ -7,7 +7,7 @@
#include "lib/BattleState.h" #include "lib/BattleState.h"
#include "client/CPlayerInterface.h" #include "client/CPlayerInterface.h"
#include "client/Client.h" #include "client/Client.h"
#include "lib/Mapping/CMap.h" #include "lib/mapping/CMap.h"
#include "lib/CBuildingHandler.h" #include "lib/CBuildingHandler.h"
#include "lib/CDefObjInfoHandler.h" #include "lib/CDefObjInfoHandler.h"
#include "lib/CGeneralTextHandler.h" #include "lib/CGeneralTextHandler.h"

2
Editor/ConfigWindows.cpp
View File

@ -1,7 +1,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "ConfigWindows.h" #include "ConfigWindows.h"
#include "Editor.h" #include "Editor.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include <QTabWidget> #include <QTabWidget>

6
Editor/Editor.cpp
View File

@ -2,10 +2,10 @@
#include "Editor.h" #include "Editor.h"
#include "../lib/VCMI_Lib.h" #include "../lib/VCMI_Lib.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/CGeneralTextHandler.h" #include "../lib/CGeneralTextHandler.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/Mapping/CMapService.h" #include "../lib/mapping/CMapService.h"
Editor::Editor(QWidget *parent) Editor::Editor(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)

4
client/AdventureMapClasses.cpp
View File

@ -3,8 +3,8 @@
#include "../CCallback.h" #include "../CCallback.h"
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/CModHandler.h" #include "../lib/CModHandler.h"
#include "../lib/CObjectHandler.h" #include "../lib/CObjectHandler.h"
#include "../lib/CGameState.h" #include "../lib/CGameState.h"

2
client/BattleInterface/CBattleInterface.cpp
View File

@ -24,7 +24,7 @@
#include "../CCreatureWindow.h" #include "../CCreatureWindow.h"
#include "../CVideoHandler.h" #include "../CVideoHandler.h"
#include "../../lib/CTownHandler.h" #include "../../lib/CTownHandler.h"
#include "../../lib/Mapping/CMap.h" #include "../../lib/mapping/CMap.h"
#include "CBattleAnimations.h" #include "CBattleAnimations.h"
#include "CBattleInterfaceClasses.h" #include "CBattleInterfaceClasses.h"

2
client/BattleInterface/CCreatureAnimation.cpp
View File

@ -1,7 +1,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "CCreatureAnimation.h" #include "CCreatureAnimation.h"
#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 "../UIFramework/SDL_Extensions.h"

2
client/CAdvmapInterface.cpp
View File

@ -19,7 +19,7 @@
#include "../lib/CHeroHandler.h" #include "../lib/CHeroHandler.h"
#include "../lib/CObjectHandler.h" #include "../lib/CObjectHandler.h"
#include "../lib/CTownHandler.h" #include "../lib/CTownHandler.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
#include "mapHandler.h" #include "mapHandler.h"
#include "CPreGame.h" #include "CPreGame.h"

4
client/CAnimation.cpp
View File

@ -1,8 +1,8 @@
#include "StdInc.h" #include "StdInc.h"
#include <SDL_image.h> #include <SDL_image.h>
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/Filesystem/ISimpleResourceLoader.h" #include "../lib/filesystem/ISimpleResourceLoader.h"
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
#include "CBitmapHandler.h" #include "CBitmapHandler.h"

4
client/CBitmapHandler.cpp
View File

@ -1,7 +1,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/Filesystem/CFileInfo.h" #include "../lib/filesystem/CFileInfo.h"
#include "SDL.h" #include "SDL.h"
#include "SDL_image.h" #include "SDL_image.h"
#include "CBitmapHandler.h" #include "CBitmapHandler.h"

2
client/CDefHandler.cpp
View File

@ -2,7 +2,7 @@
#include "SDL.h" #include "SDL.h"
#include "CDefHandler.h" #include "CDefHandler.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/VCMI_Lib.h" #include "../lib/VCMI_Lib.h"
#include "CBitmapHandler.h" #include "CBitmapHandler.h"

2
client/CMT.cpp
View File

@ -7,7 +7,7 @@
#include "CGameInfo.h" #include "CGameInfo.h"
#include "mapHandler.h" #include "mapHandler.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "CPreGame.h" #include "CPreGame.h"
#include "CCastleInterface.h" #include "CCastleInterface.h"
#include "../lib/CConsoleHandler.h" #include "../lib/CConsoleHandler.h"

2
client/CMusicHandler.cpp
View File

@ -7,7 +7,7 @@
#include "../client/CGameInfo.h" #include "../client/CGameInfo.h"
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
#include "../lib/GameConstants.h" #include "../lib/GameConstants.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
/* /*
* CMusicHandler.cpp, part of VCMI engine * CMusicHandler.cpp, part of VCMI engine

2
client/CPlayerInterface.cpp
View File

@ -30,7 +30,7 @@
#include "CMusicHandler.h" #include "CMusicHandler.h"
#include "../lib/CondSh.h" #include "../lib/CondSh.h"
#include "../lib/NetPacks.h" #include "../lib/NetPacks.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"
#include "mapHandler.h" #include "mapHandler.h"
#include "../lib/CStopWatch.h" #include "../lib/CStopWatch.h"

12
client/CPreGame.cpp
View File

@ -1,9 +1,9 @@
#include "StdInc.h" #include "StdInc.h"
#include "CPreGame.h" #include "CPreGame.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/Filesystem/CFileInfo.h" #include "../lib/filesystem/CFileInfo.h"
#include "../lib/Filesystem/CCompressedStream.h" #include "../lib/filesystem/CCompressedStream.h"
#include "../lib/CStopWatch.h" #include "../lib/CStopWatch.h"
#include "UIFramework/SDL_Extensions.h" #include "UIFramework/SDL_Extensions.h"
@ -16,7 +16,7 @@
#include "../lib/CTownHandler.h" #include "../lib/CTownHandler.h"
#include "../lib/CHeroHandler.h" #include "../lib/CHeroHandler.h"
#include "../lib/CObjectHandler.h" #include "../lib/CObjectHandler.h"
#include "../lib/Mapping/CCampaignHandler.h" #include "../lib/mapping/CCampaignHandler.h"
#include "../lib/CCreatureHandler.h" #include "../lib/CCreatureHandler.h"
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
#include "CMusicHandler.h" #include "CMusicHandler.h"
@ -24,7 +24,7 @@
#include "Graphics.h" #include "Graphics.h"
#include "../lib/Connection.h" #include "../lib/Connection.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "GUIClasses.h" #include "GUIClasses.h"
#include "CPlayerInterface.h" #include "CPlayerInterface.h"
#include "../CCallback.h" #include "../CCallback.h"
@ -41,7 +41,7 @@
#include "../lib/GameConstants.h" #include "../lib/GameConstants.h"
#include "UIFramework/CGuiHandler.h" #include "UIFramework/CGuiHandler.h"
#include "UIFramework/CIntObjectClasses.h" #include "UIFramework/CIntObjectClasses.h"
#include "../lib/Mapping/CMapService.h" #include "../lib/mapping/CMapService.h"
/* /*
* CPreGame.cpp, part of VCMI engine * CPreGame.cpp, part of VCMI engine

6
client/CPreGame.h
View File

@ -1,12 +1,12 @@
#pragma once #pragma once
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include <SDL.h> #include <SDL.h>
#include "../lib/StartInfo.h" #include "../lib/StartInfo.h"
#include "GUIClasses.h" #include "GUIClasses.h"
#include "FunctionList.h" #include "FunctionList.h"
#include "../lib/Mapping/CMapInfo.h" #include "../lib/mapping/CMapInfo.h"
#include "../lib/RMG/CMapGenOptions.h" #include "../lib/rmg/CMapGenOptions.h"
/* /*
* CPreGame.h, part of VCMI engine * CPreGame.h, part of VCMI engine

2
client/CVideoHandler.cpp
View File

@ -5,7 +5,7 @@
#include "UIFramework/CGuiHandler.h" #include "UIFramework/CGuiHandler.h"
#include "UIFramework/SDL_Extensions.h" #include "UIFramework/SDL_Extensions.h"
#include "CPlayerInterface.h" #include "CPlayerInterface.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
extern CGuiHandler GH; //global gui handler extern CGuiHandler GH; //global gui handler

2
client/CVideoHandler.h
View File

@ -217,7 +217,7 @@ public:
#ifndef DISABLE_VIDEO #ifndef DISABLE_VIDEO
#include "../lib/Filesystem/CInputStream.h" #include "../lib/filesystem/CInputStream.h"
#include <SDL.h> #include <SDL.h>
#include <SDL_video.h> #include <SDL_video.h>

4
client/Client.cpp
View File

@ -1,7 +1,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "CMusicHandler.h" #include "CMusicHandler.h"
#include "../lib/Mapping/CCampaignHandler.h" #include "../lib/mapping/CCampaignHandler.h"
#include "../CCallback.h" #include "../CCallback.h"
#include "../lib/CConsoleHandler.h" #include "../lib/CConsoleHandler.h"
#include "CGameInfo.h" #include "CGameInfo.h"
@ -23,7 +23,7 @@
#include "../lib/NetPacks.h" #include "../lib/NetPacks.h"
#include "../lib/VCMI_Lib.h" #include "../lib/VCMI_Lib.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
#include "mapHandler.h" #include "mapHandler.h"
#include "../lib/CConfigHandler.h" #include "../lib/CConfigHandler.h"

2
client/GUIClasses.cpp
View File

@ -26,7 +26,7 @@
#include "../lib/CSpellHandler.h" #include "../lib/CSpellHandler.h"
#include "../lib/CTownHandler.h" #include "../lib/CTownHandler.h"
#include "../lib/CondSh.h" #include "../lib/CondSh.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "mapHandler.h" #include "mapHandler.h"
#include "../lib/CStopWatch.h" #include "../lib/CStopWatch.h"
#include "../lib/NetPacks.h" #include "../lib/NetPacks.h"

2
client/Graphics.cpp
View File

@ -1,7 +1,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "Graphics.h" #include "Graphics.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "CDefHandler.h" #include "CDefHandler.h"
#include "UIFramework/SDL_Extensions.h" #include "UIFramework/SDL_Extensions.h"
#include <SDL_ttf.h> #include <SDL_ttf.h>

8
client/NetPacksClient.cpp
View File

@ -1,8 +1,8 @@
#include "StdInc.h" #include "StdInc.h"
#include "../lib/NetPacks.h" #include "../lib/NetPacks.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/Filesystem/CFileInfo.h" #include "../lib/filesystem/CFileInfo.h"
#include "../CCallback.h" #include "../CCallback.h"
#include "Client.h" #include "Client.h"
#include "CPlayerInterface.h" #include "CPlayerInterface.h"
@ -13,7 +13,7 @@
#include "../lib/CHeroHandler.h" #include "../lib/CHeroHandler.h"
#include "../lib/CObjectHandler.h" #include "../lib/CObjectHandler.h"
#include "../lib/VCMI_Lib.h" #include "../lib/VCMI_Lib.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"
#include "../lib/CSpellHandler.h" #include "../lib/CSpellHandler.h"
#include "CSoundBase.h" #include "CSoundBase.h"
@ -22,7 +22,7 @@
#include "../lib/CConfigHandler.h" #include "../lib/CConfigHandler.h"
#include "UIFramework/SDL_Extensions.h" #include "UIFramework/SDL_Extensions.h"
#include "BattleInterface/CBattleInterface.h" #include "BattleInterface/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"

2
client/UIFramework/Fonts.cpp
View File

@ -6,7 +6,7 @@
#include "SDL_Pixels.h" #include "SDL_Pixels.h"
#include "../../lib/JsonNode.h" #include "../../lib/JsonNode.h"
#include "../../lib/vcmi_endian.h" #include "../../lib/vcmi_endian.h"
#include "../../lib/Filesystem/CResourceLoader.h" #include "../../lib/filesystem/CResourceLoader.h"
/* /*
* Fonts.cpp, part of VCMI engine * Fonts.cpp, part of VCMI engine

2
client/mapHandler.cpp
View File

@ -9,7 +9,7 @@
#include "../lib/CTownHandler.h" #include "../lib/CTownHandler.h"
#include "Graphics.h" #include "Graphics.h"
#include "../lib/CObjectHandler.h" #include "../lib/CObjectHandler.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "CDefHandler.h" #include "CDefHandler.h"
#include "../lib/CConfigHandler.h" #include "../lib/CConfigHandler.h"
#include "../lib/CGeneralTextHandler.h" #include "../lib/CGeneralTextHandler.h"

2
lib/BattleState.cpp
View File

@ -11,7 +11,7 @@
#include "CTownHandler.h" #include "CTownHandler.h"
#include "NetPacks.h" #include "NetPacks.h"
#include "JsonNode.h" #include "JsonNode.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
/* /*

2
lib/CArtHandler.cpp
View File

@ -1,7 +1,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "CArtHandler.h" #include "CArtHandler.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "CGeneralTextHandler.h" #include "CGeneralTextHandler.h"
#include <boost/random/linear_congruential.hpp> #include <boost/random/linear_congruential.hpp>
#include "VCMI_Lib.h" #include "VCMI_Lib.h"

4
lib/CBonusTypeHandler.cpp
View File

@ -11,8 +11,8 @@
#include "CBonusTypeHandler.h" #include "CBonusTypeHandler.h"
#include "JsonNode.h" #include "JsonNode.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "Filesystem/ISimpleResourceLoader.h" #include "filesystem/ISimpleResourceLoader.h"
#include "VCMI_Lib.h" #include "VCMI_Lib.h"

2
lib/CConfigHandler.cpp
View File

@ -1,7 +1,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "CConfigHandler.h" #include "CConfigHandler.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/GameConstants.h" #include "../lib/GameConstants.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"

2
lib/CCreatureHandler.cpp
View File

@ -2,7 +2,7 @@
#include "CCreatureHandler.h" #include "CCreatureHandler.h"
#include "CGeneralTextHandler.h" #include "CGeneralTextHandler.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "VCMI_Lib.h" #include "VCMI_Lib.h"
#include "CGameState.h" #include "CGameState.h"
#include "CTownHandler.h" #include "CTownHandler.h"

2
lib/CDefObjInfoHandler.cpp
View File

@ -1,7 +1,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "CDefObjInfoHandler.h" #include "CDefObjInfoHandler.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "../client/CGameInfo.h" #include "../client/CGameInfo.h"
#include "../lib/VCMI_Lib.h" #include "../lib/VCMI_Lib.h"
#include "GameConstants.h" #include "GameConstants.h"

14
lib/CGameState.cpp
View File

@ -2,7 +2,7 @@
#include "CGameState.h" #include "CGameState.h"
#include <boost/random/linear_congruential.hpp> #include <boost/random/linear_congruential.hpp>
#include "Mapping/CCampaignHandler.h" #include "mapping/CCampaignHandler.h"
#include "CDefObjInfoHandler.h" #include "CDefObjInfoHandler.h"
#include "CArtHandler.h" #include "CArtHandler.h"
#include "CBuildingHandler.h" #include "CBuildingHandler.h"
@ -15,18 +15,18 @@
#include "CModHandler.h" #include "CModHandler.h"
#include "VCMI_Lib.h" #include "VCMI_Lib.h"
#include "Connection.h" #include "Connection.h"
#include "Mapping/CMap.h" #include "mapping/CMap.h"
#include "Mapping/CMapService.h" #include "mapping/CMapService.h"
#include "StartInfo.h" #include "StartInfo.h"
#include "NetPacks.h" #include "NetPacks.h"
#include "RegisterTypes.h" #include "RegisterTypes.h"
#include "Mapping/CMapInfo.h" #include "mapping/CMapInfo.h"
#include "BattleState.h" #include "BattleState.h"
#include "JsonNode.h" #include "JsonNode.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "GameConstants.h" #include "GameConstants.h"
#include "RMG/CMapGenOptions.h" #include "rmg/CMapGenOptions.h"
#include "RMG/CMapGenerator.h" #include "rmg/CMapGenerator.h"
DLL_LINKAGE boost::rand48 ran; DLL_LINKAGE boost::rand48 ran;
class CGObjectInstance; class CGObjectInstance;

2
lib/CGameState.h
View File

@ -5,7 +5,7 @@
//#ifndef _MSC_VER //#ifndef _MSC_VER
#include "CCreatureHandler.h" #include "CCreatureHandler.h"
#include "VCMI_Lib.h" #include "VCMI_Lib.h"
#include "Mapping/CMap.h" #include "mapping/CMap.h"
//#endif //#endif
#include "HeroBonus.h" #include "HeroBonus.h"

4
lib/CGeneralTextHandler.cpp
View File

@ -1,8 +1,8 @@
#include "StdInc.h" #include "StdInc.h"
#include "CGeneralTextHandler.h" #include "CGeneralTextHandler.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "Filesystem/CInputStream.h" #include "filesystem/CInputStream.h"
#include "GameConstants.h" #include "GameConstants.h"
// #include <locale> //needed? // #include <locale> //needed?

2
lib/CHeroHandler.cpp
View File

@ -2,7 +2,7 @@
#include "CHeroHandler.h" #include "CHeroHandler.h"
#include "CGeneralTextHandler.h" #include "CGeneralTextHandler.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "VCMI_Lib.h" #include "VCMI_Lib.h"
#include "JsonNode.h" #include "JsonNode.h"
#include "StringConstants.h" #include "StringConstants.h"

48
lib/CMakeLists.txt
View File

@ -5,24 +5,24 @@ include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIRECTORY} ${
include_directories(${Boost_INCLUDE_DIRS} ${SDL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIRS} ${SDL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
set(lib_SRCS set(lib_SRCS
Filesystem/CBinaryReader.cpp filesystem/CBinaryReader.cpp
Filesystem/CFilesystemLoader.cpp filesystem/CFilesystemLoader.cpp
Filesystem/CMemoryStream.cpp filesystem/CMemoryStream.cpp
Filesystem/CFileInfo.cpp filesystem/CFileInfo.cpp
Filesystem/CLodArchiveLoader.cpp filesystem/CLodArchiveLoader.cpp
Filesystem/CResourceLoader.cpp filesystem/CResourceLoader.cpp
Filesystem/CFileInputStream.cpp filesystem/CFileInputStream.cpp
Filesystem/CCompressedStream.cpp filesystem/CCompressedStream.cpp
logging/CBasicLogConfigurator.cpp logging/CBasicLogConfigurator.cpp
logging/CLogger.cpp logging/CLogger.cpp
Mapping/CCampaignHandler.cpp mapping/CCampaignHandler.cpp
Mapping/CMap.cpp mapping/CMap.cpp
Mapping/CMapEditManager.cpp mapping/CMapEditManager.cpp
Mapping/CMapInfo.cpp mapping/CMapInfo.cpp
Mapping/CMapService.cpp mapping/CMapService.cpp
Mapping/MapFormatH3M.cpp mapping/MapFormatH3M.cpp
RMG/CMapGenOptions.cpp rmg/CMapGenOptions.cpp
RMG/CMapGenerator.cpp rmg/CMapGenerator.cpp
BattleAction.cpp BattleAction.cpp
BattleHex.cpp BattleHex.cpp
BattleState.cpp BattleState.cpp
@ -59,16 +59,16 @@ set(lib_SRCS
) )
set(lib_HEADERS set(lib_HEADERS
Filesystem/CInputStream.h filesystem/CInputStream.h
Filesystem/ISimpleResourceLoader.h filesystem/ISimpleResourceLoader.h
logging/CBasicLogConfigurator.h logging/CBasicLogConfigurator.h
logging/CLogger.h logging/CLogger.h
Mapping/CCampaignHandler.h mapping/CCampaignHandler.h
Mapping/CMap.h mapping/CMap.h
Mapping/CMapEditManager.h mapping/CMapEditManager.h
Mapping/CMapInfo.h mapping/CMapInfo.h
Mapping/CMapService.h mapping/CMapService.h
Mapping/MapFormatH3M.h mapping/MapFormatH3M.h
AI_Base.h AI_Base.h
CondSh.h CondSh.h
ConstTransitivePtr.h ConstTransitivePtr.h

4
lib/CModHandler.cpp
View File

@ -2,8 +2,8 @@
#include "CModHandler.h" #include "CModHandler.h"
#include "CDefObjInfoHandler.h" #include "CDefObjInfoHandler.h"
#include "JsonNode.h" #include "JsonNode.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "Filesystem/ISimpleResourceLoader.h" #include "filesystem/ISimpleResourceLoader.h"
#include "CCreatureHandler.h" #include "CCreatureHandler.h"
#include "CArtHandler.h" #include "CArtHandler.h"

2
lib/CModHandler.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "VCMI_Lib.h" #include "VCMI_Lib.h"

4
lib/CObjectHandler.cpp
View File

@ -26,11 +26,11 @@
#include "CGameState.h" #include "CGameState.h"
#include "NetPacks.h" #include "NetPacks.h"
#include "StartInfo.h" #include "StartInfo.h"
#include "Mapping/CMap.h" #include "mapping/CMap.h"
#include <SDL_stdinc.h> #include <SDL_stdinc.h>
#include "CBuildingHandler.h" #include "CBuildingHandler.h"
#include "JsonNode.h" #include "JsonNode.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
using namespace boost::assign; using namespace boost::assign;

2
lib/CSpellHandler.cpp
View File

@ -2,7 +2,7 @@
#include "CSpellHandler.h" #include "CSpellHandler.h"
#include "CGeneralTextHandler.h" #include "CGeneralTextHandler.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "VCMI_Lib.h" #include "VCMI_Lib.h"
#include "JsonNode.h" #include "JsonNode.h"
#include <cctype> #include <cctype>

2
lib/CTownHandler.cpp
View File

@ -9,7 +9,7 @@
#include "CHeroHandler.h" #include "CHeroHandler.h"
#include "CArtHandler.h" #include "CArtHandler.h"
#include "CSpellHandler.h" #include "CSpellHandler.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
/* /*
* CTownHandler.cpp, part of VCMI engine * CTownHandler.cpp, part of VCMI engine

2
lib/Connection.h
View File

@ -24,7 +24,7 @@
#include "ConstTransitivePtr.h" #include "ConstTransitivePtr.h"
#include "CCreatureSet.h" //for CStackInstance #include "CCreatureSet.h" //for CStackInstance
#include "CObjectHandler.h" //for CArmedInstance #include "CObjectHandler.h" //for CArmedInstance
#include "Mapping/CCampaignHandler.h" //for CCampaignState #include "mapping/CCampaignHandler.h" //for CCampaignState
const ui32 version = 739; const ui32 version = 739;

2
lib/IGameCallback.cpp
View File

@ -4,7 +4,7 @@
#include <boost/random/linear_congruential.hpp> #include <boost/random/linear_congruential.hpp>
#include "CGameState.h" #include "CGameState.h"
#include "Mapping/CMap.h" #include "mapping/CMap.h"
#include "CObjectHandler.h" #include "CObjectHandler.h"
#include "CHeroHandler.h" #include "CHeroHandler.h"
#include "StartInfo.h" #include "StartInfo.h"

2
lib/JsonNode.cpp
View File

@ -14,7 +14,7 @@
#include "ScopeGuard.h" #include "ScopeGuard.h"
#include "HeroBonus.h" #include "HeroBonus.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
#include "VCMI_Lib.h" //for identifier resolution #include "VCMI_Lib.h" //for identifier resolution
#include "CModHandler.h" #include "CModHandler.h"

2
lib/NetPacks.h
View File

@ -5,7 +5,7 @@
#include "BattleAction.h" #include "BattleAction.h"
#include "HeroBonus.h" #include "HeroBonus.h"
#include "CCreatureSet.h" #include "CCreatureSet.h"
#include "Mapping/CMapInfo.h" #include "mapping/CMapInfo.h"
#include "StartInfo.h" #include "StartInfo.h"
#include "ConstTransitivePtr.h" #include "ConstTransitivePtr.h"
#include "int3.h" #include "int3.h"

2
lib/NetPacksLib.cpp
View File

@ -8,7 +8,7 @@
#include "CObjectHandler.h" #include "CObjectHandler.h"
#include "CModHandler.h" #include "CModHandler.h"
#include "VCMI_Lib.h" #include "VCMI_Lib.h"
#include "Mapping/CMap.h" #include "mapping/CMap.h"
#include "CSpellHandler.h" #include "CSpellHandler.h"
#include "CCreatureHandler.h" #include "CCreatureHandler.h"
#include "CGameState.h" #include "CGameState.h"

6
lib/RegisterTypes.cpp
View File

@ -2,11 +2,11 @@
#define DO_NOT_DISABLE_REGISTER_TYPES_INSTANTIATION #define DO_NOT_DISABLE_REGISTER_TYPES_INSTANTIATION
#include "RegisterTypes.h" #include "RegisterTypes.h"
#include "Mapping/CMapInfo.h" #include "mapping/CMapInfo.h"
#include "StartInfo.h" #include "StartInfo.h"
#include "BattleState.h" #include "BattleState.h"
#include "CGameState.h" #include "CGameState.h"
#include "Mapping/CMap.h" #include "mapping/CMap.h"
#include "CModHandler.h" #include "CModHandler.h"
#include "CObjectHandler.h" #include "CObjectHandler.h"
#include "CCreatureHandler.h" #include "CCreatureHandler.h"
@ -15,7 +15,7 @@
#include "CHeroHandler.h" #include "CHeroHandler.h"
#include "CSpellHandler.h" #include "CSpellHandler.h"
#include "CTownHandler.h" #include "CTownHandler.h"
#include "Mapping/CCampaignHandler.h" #include "mapping/CCampaignHandler.h"
#include "NetPacks.h" #include "NetPacks.h"
#include "CDefObjInfoHandler.h" #include "CDefObjInfoHandler.h"

2
lib/StartInfo.h
View File

@ -12,7 +12,7 @@
* *
*/ */
#include "RMG/CMapGenOptions.h" #include "rmg/CMapGenOptions.h"
class CCampaignState; class CCampaignState;

2
lib/VCMI_Lib.cpp
View File

@ -25,7 +25,7 @@
#include "IGameEventsReceiver.h" #include "IGameEventsReceiver.h"
#include "CStopWatch.h" #include "CStopWatch.h"
#include "VCMIDirs.h" #include "VCMIDirs.h"
#include "Filesystem/CResourceLoader.h" #include "filesystem/CResourceLoader.h"
LibClasses * VLC = NULL; LibClasses * VLC = NULL;

72
lib/VCMI_lib.cbp
View File

@ -118,24 +118,24 @@
<Unit filename="Connection.cpp" /> <Unit filename="Connection.cpp" />
<Unit filename="Connection.h" /> <Unit filename="Connection.h" />
<Unit filename="ConstTransitivePtr.h" /> <Unit filename="ConstTransitivePtr.h" />
<Unit filename="Filesystem/CBinaryReader.cpp" /> <Unit filename="filesystem/CBinaryReader.cpp" />
<Unit filename="Filesystem/CBinaryReader.h" /> <Unit filename="filesystem/CBinaryReader.h" />
<Unit filename="Filesystem/CCompressedStream.cpp" /> <Unit filename="filesystem/CCompressedStream.cpp" />
<Unit filename="Filesystem/CCompressedStream.h" /> <Unit filename="filesystem/CCompressedStream.h" />
<Unit filename="Filesystem/CFileInfo.cpp" /> <Unit filename="filesystem/CFileInfo.cpp" />
<Unit filename="Filesystem/CFileInfo.h" /> <Unit filename="filesystem/CFileInfo.h" />
<Unit filename="Filesystem/CFileInputStream.cpp" /> <Unit filename="filesystem/CFileInputStream.cpp" />
<Unit filename="Filesystem/CFileInputStream.h" /> <Unit filename="filesystem/CFileInputStream.h" />
<Unit filename="Filesystem/CFilesystemLoader.cpp" /> <Unit filename="filesystem/CFilesystemLoader.cpp" />
<Unit filename="Filesystem/CFilesystemLoader.h" /> <Unit filename="filesystem/CFilesystemLoader.h" />
<Unit filename="Filesystem/CInputStream.h" /> <Unit filename="filesystem/CInputStream.h" />
<Unit filename="Filesystem/CLodArchiveLoader.cpp" /> <Unit filename="filesystem/CLodArchiveLoader.cpp" />
<Unit filename="Filesystem/CLodArchiveLoader.h" /> <Unit filename="filesystem/CLodArchiveLoader.h" />
<Unit filename="Filesystem/CMemoryStream.cpp" /> <Unit filename="filesystem/CMemoryStream.cpp" />
<Unit filename="Filesystem/CMemoryStream.h" /> <Unit filename="filesystem/CMemoryStream.h" />
<Unit filename="Filesystem/CResourceLoader.cpp" /> <Unit filename="filesystem/CResourceLoader.cpp" />
<Unit filename="Filesystem/CResourceLoader.h" /> <Unit filename="filesystem/CResourceLoader.h" />
<Unit filename="Filesystem/ISimpleResourceLoader.h" /> <Unit filename="filesystem/ISimpleResourceLoader.h" />
<Unit filename="GameConstants.cpp" /> <Unit filename="GameConstants.cpp" />
<Unit filename="GameConstants.h" /> <Unit filename="GameConstants.h" />
<Unit filename="HeroBonus.cpp" /> <Unit filename="HeroBonus.cpp" />
@ -147,24 +147,28 @@
<Unit filename="Interprocess.h" /> <Unit filename="Interprocess.h" />
<Unit filename="JsonNode.cpp" /> <Unit filename="JsonNode.cpp" />
<Unit filename="JsonNode.h" /> <Unit filename="JsonNode.h" />
<Unit filename="Mapping/CCampaignHandler.cpp" /> <Unit filename="mapping/CCampaignHandler.cpp" />
<Unit filename="Mapping/CCampaignHandler.h" /> <Unit filename="mapping/CCampaignHandler.h" />
<Unit filename="Mapping/CMap.cpp" /> <Unit filename="mapping/CMap.cpp" />
<Unit filename="Mapping/CMap.h" /> <Unit filename="mapping/CMap.h" />
<Unit filename="Mapping/CMapEditManager.cpp" /> <Unit filename="mapping/CMapEditManager.cpp" />
<Unit filename="Mapping/CMapEditManager.h" /> <Unit filename="mapping/CMapEditManager.h" />
<Unit filename="Mapping/CMapInfo.cpp" /> <Unit filename="mapping/CMapInfo.cpp" />
<Unit filename="Mapping/CMapInfo.h" /> <Unit filename="mapping/CMapInfo.h" />
<Unit filename="Mapping/CMapService.cpp" /> <Unit filename="mapping/CMapService.cpp" />
<Unit filename="Mapping/CMapService.h" /> <Unit filename="mapping/CMapService.h" />
<Unit filename="Mapping/MapFormatH3M.cpp" /> <Unit filename="mapping/MapFormatH3M.cpp" />
<Unit filename="Mapping/MapFormatH3M.h" /> <Unit filename="mapping/MapFormatH3M.h" />
<Unit filename="NetPacks.h" /> <Unit filename="NetPacks.h" />
<Unit filename="NetPacksLib.cpp" /> <Unit filename="NetPacksLib.cpp" />
<Unit filename="RMG/CMapGenOptions.cpp" /> <Unit filename="rmg/CMapGenOptions.cpp" />
<Unit filename="RMG/CMapGenOptions.h" /> <Unit filename="rmg/CMapGenOptions.h" />
<Unit filename="RMG/CMapGenerator.cpp" /> <Unit filename="rmg/CMapGenerator.cpp" />
<Unit filename="RMG/CMapGenerator.h" /> <Unit filename="rmg/CMapGenerator.h" />
<Unit filename="logging/CLogger.cpp" />
<Unit filename="logging/CLogger.h" />
<Unit filename="logging/CBasicLogConfigurator.cpp" />
<Unit filename="logging/CBasicLogConfigurator.h" />
<Unit filename="RegisterTypes.cpp" /> <Unit filename="RegisterTypes.cpp" />
<Unit filename="RegisterTypes.h" /> <Unit filename="RegisterTypes.h" />
<Unit filename="ResourceSet.cpp" /> <Unit filename="ResourceSet.cpp" />

74
lib/VCMI_lib.vcxproj
View File

@ -186,24 +186,26 @@
<ClCompile Include="CSpellHandler.cpp" /> <ClCompile Include="CSpellHandler.cpp" />
<ClCompile Include="CThreadHelper.cpp" /> <ClCompile Include="CThreadHelper.cpp" />
<ClCompile Include="CTownHandler.cpp" /> <ClCompile Include="CTownHandler.cpp" />
<ClCompile Include="Filesystem\CBinaryReader.cpp" /> <ClCompile Include="filesystem\CBinaryReader.cpp" />
<ClCompile Include="Filesystem\CCompressedStream.cpp" /> <ClCompile Include="filesystem\CCompressedStream.cpp" />
<ClCompile Include="Filesystem\CFileInfo.cpp" /> <ClCompile Include="filesystem\CFileInfo.cpp" />
<ClCompile Include="Filesystem\CFileInputStream.cpp" /> <ClCompile Include="filesystem\CFileInputStream.cpp" />
<ClCompile Include="Filesystem\CFilesystemLoader.cpp" /> <ClCompile Include="filesystem\CFilesystemLoader.cpp" />
<ClCompile Include="Filesystem\CLodArchiveLoader.cpp" /> <ClCompile Include="filesystem\CLodArchiveLoader.cpp" />
<ClCompile Include="Filesystem\CMemoryStream.cpp" /> <ClCompile Include="filesystem\CMemoryStream.cpp" />
<ClCompile Include="Filesystem\CResourceLoader.cpp" /> <ClCompile Include="filesystem\CResourceLoader.cpp" />
<ClCompile Include="GameConstants.cpp" /> <ClCompile Include="GameConstants.cpp" />
<ClCompile Include="Mapping\CCampaignHandler.cpp" /> <ClCompile Include="mapping\CCampaignHandler.cpp" />
<ClCompile Include="Mapping\CMap.cpp" /> <ClCompile Include="mapping\CMap.cpp" />
<ClCompile Include="Mapping\CMapInfo.cpp" /> <ClCompile Include="mapping\CMapInfo.cpp" />
<ClCompile Include="Mapping\CMapService.cpp" /> <ClCompile Include="mapping\CMapService.cpp" />
<ClCompile Include="Mapping\CMapEditManager.cpp" /> <ClCompile Include="mapping\CMapEditManager.cpp" />
<ClCompile Include="Mapping\MapFormatH3M.cpp" /> <ClCompile Include="mapping\MapFormatH3M.cpp" />
<ClCompile Include="RegisterTypes.cpp" /> <ClCompile Include="RegisterTypes.cpp" />
<ClCompile Include="RMG\CMapGenOptions.cpp" /> <ClCompile Include="rmg\CMapGenOptions.cpp" />
<ClCompile Include="RMG\CMapGenerator.cpp" /> <ClCompile Include="rmg\CMapGenerator.cpp" />
<ClCompile Include="logging\CLogger.cpp" />
<ClCompile Include="logging\CBasicLogConfigurator.cpp" />
<ClCompile Include="HeroBonus.cpp" /> <ClCompile Include="HeroBonus.cpp" />
<ClCompile Include="CBattleCallback.cpp" /> <ClCompile Include="CBattleCallback.cpp" />
<ClCompile Include="IGameCallback.cpp" /> <ClCompile Include="IGameCallback.cpp" />
@ -253,25 +255,27 @@
<ClInclude Include="CStopWatch.h" /> <ClInclude Include="CStopWatch.h" />
<ClInclude Include="CThreadHelper.h" /> <ClInclude Include="CThreadHelper.h" />
<ClInclude Include="CTownHandler.h" /> <ClInclude Include="CTownHandler.h" />
<ClInclude Include="Filesystem\CBinaryReader.h" /> <ClInclude Include="filesystem\CBinaryReader.h" />
<ClInclude Include="Filesystem\CCompressedStream.h" /> <ClInclude Include="filesystem\CCompressedStream.h" />
<ClInclude Include="Filesystem\CFileInfo.h" /> <ClInclude Include="filesystem\CFileInfo.h" />
<ClInclude Include="Filesystem\CFileInputStream.h" /> <ClInclude Include="filesystem\CFileInputStream.h" />
<ClInclude Include="Filesystem\CFilesystemLoader.h" /> <ClInclude Include="filesystem\CFilesystemLoader.h" />
<ClInclude Include="Filesystem\CInputStream.h" /> <ClInclude Include="filesystem\CInputStream.h" />
<ClInclude Include="Filesystem\CLodArchiveLoader.h" /> <ClInclude Include="filesystem\CLodArchiveLoader.h" />
<ClInclude Include="Filesystem\CMemoryStream.h" /> <ClInclude Include="filesystem\CMemoryStream.h" />
<ClInclude Include="Filesystem\CResourceLoader.h" /> <ClInclude Include="filesystem\CResourceLoader.h" />
<ClInclude Include="Filesystem\ISimpleResourceLoader.h" /> <ClInclude Include="filesystem\ISimpleResourceLoader.h" />
<ClInclude Include="IBonusTypeHandler.h" /> <ClInclude Include="IBonusTypeHandler.h" />
<ClInclude Include="Mapping\CCampaignHandler.h" /> <ClInclude Include="mapping\CCampaignHandler.h" />
<ClInclude Include="Mapping\CMap.h" /> <ClInclude Include="mapping\CMap.h" />
<ClInclude Include="Mapping\CMapInfo.h" /> <ClInclude Include="mapping\CMapInfo.h" />
<ClInclude Include="Mapping\CMapService.h" /> <ClInclude Include="mapping\CMapService.h" />
<ClInclude Include="Mapping\CMapEditManager.h" /> <ClInclude Include="mapping\CMapEditManager.h" />
<ClInclude Include="Mapping\MapFormatH3M.h" /> <ClInclude Include="mapping\MapFormatH3M.h" />
<ClInclude Include="RMG\CMapGenOptions.h" /> <ClInclude Include="rmg\CMapGenOptions.h" />
<ClInclude Include="RMG\CMapGenerator.h" /> <ClInclude Include="rmg\CMapGenerator.h" />
<ClCompile Include="logging\CLogger.h" />
<ClCompile Include="logging\CBasicLogConfigurator.h" />
<ClInclude Include="GameConstants.h" /> <ClInclude Include="GameConstants.h" />
<ClInclude Include="HeroBonus.h" /> <ClInclude Include="HeroBonus.h" />
<ClInclude Include="CBattleCallback.h" /> <ClInclude Include="CBattleCallback.h" />
@ -292,4 +296,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

0
lib/Filesystem/CBinaryReader.cpp → lib/filesystem/CBinaryReader.cpp
View File

0
lib/Filesystem/CBinaryReader.h → lib/filesystem/CBinaryReader.h
View File

0
lib/Filesystem/CCompressedStream.cpp → lib/filesystem/CCompressedStream.cpp
View File

0
lib/Filesystem/CCompressedStream.h → lib/filesystem/CCompressedStream.h
View File

0
lib/Filesystem/CFileInfo.cpp → lib/filesystem/CFileInfo.cpp
View File

0
lib/Filesystem/CFileInfo.h → lib/filesystem/CFileInfo.h
View File

0
lib/Filesystem/CFileInputStream.cpp → lib/filesystem/CFileInputStream.cpp
View File

0
lib/Filesystem/CFileInputStream.h → lib/filesystem/CFileInputStream.h
View File

0
lib/Filesystem/CFilesystemLoader.cpp → lib/filesystem/CFilesystemLoader.cpp
View File

0
lib/Filesystem/CFilesystemLoader.h → lib/filesystem/CFilesystemLoader.h
View File

0
lib/Filesystem/CInputStream.h → lib/filesystem/CInputStream.h
View File

0
lib/Filesystem/CLodArchiveLoader.cpp → lib/filesystem/CLodArchiveLoader.cpp
View File

0
lib/Filesystem/CLodArchiveLoader.h → lib/filesystem/CLodArchiveLoader.h
View File

0
lib/Filesystem/CMemoryStream.cpp → lib/filesystem/CMemoryStream.cpp
View File

0
lib/Filesystem/CMemoryStream.h → lib/filesystem/CMemoryStream.h
View File

0
lib/Filesystem/CResourceLoader.cpp → lib/filesystem/CResourceLoader.cpp
View File

0
lib/Filesystem/CResourceLoader.h → lib/filesystem/CResourceLoader.h
View File

0
lib/Filesystem/ISimpleResourceLoader.h → lib/filesystem/ISimpleResourceLoader.h
View File

4
lib/Mapping/CCampaignHandler.cpp → lib/mapping/CCampaignHandler.cpp
View File

@ -1,8 +1,8 @@
#include "StdInc.h" #include "StdInc.h"
#include "CCampaignHandler.h" #include "CCampaignHandler.h"
#include "../Filesystem/CResourceLoader.h" #include "../filesystem/CResourceLoader.h"
#include "../Filesystem/CCompressedStream.h" #include "../filesystem/CCompressedStream.h"
#include "../VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "../vcmi_endian.h" #include "../vcmi_endian.h"
#include "../CGeneralTextHandler.h" #include "../CGeneralTextHandler.h"

0
lib/Mapping/CCampaignHandler.h → lib/mapping/CCampaignHandler.h
View File

0
lib/Mapping/CMap.cpp → lib/mapping/CMap.cpp
View File

0
lib/Mapping/CMap.h → lib/mapping/CMap.h
View File

2
lib/Mapping/CMapEditManager.cpp → lib/mapping/CMapEditManager.cpp
View File

@ -2,7 +2,7 @@
#include "CMapEditManager.h" #include "CMapEditManager.h"
#include "../JsonNode.h" #include "../JsonNode.h"
#include "../Filesystem/CResourceLoader.h" #include "../filesystem/CResourceLoader.h"
#include "../CDefObjInfoHandler.h" #include "../CDefObjInfoHandler.h"
const std::string TerrainViewPattern::FLIP_MODE_SAME_IMAGE = "sameImage"; const std::string TerrainViewPattern::FLIP_MODE_SAME_IMAGE = "sameImage";

0
lib/Mapping/CMapEditManager.h → lib/mapping/CMapEditManager.h
View File

0
lib/Mapping/CMapInfo.cpp → lib/mapping/CMapInfo.cpp
View File

0
lib/Mapping/CMapInfo.h → lib/mapping/CMapInfo.h
View File

8
lib/Mapping/CMapService.cpp → lib/mapping/CMapService.cpp
View File

@ -1,10 +1,10 @@
#include "StdInc.h" #include "StdInc.h"
#include "CMapService.h" #include "CMapService.h"
#include "../Filesystem/CResourceLoader.h" #include "../filesystem/CResourceLoader.h"
#include "../Filesystem/CBinaryReader.h" #include "../filesystem/CBinaryReader.h"
#include "../Filesystem/CCompressedStream.h" #include "../filesystem/CCompressedStream.h"
#include "../Filesystem/CMemoryStream.h" #include "../filesystem/CMemoryStream.h"
#include "CMap.h" #include "CMap.h"
#include "MapFormatH3M.h" #include "MapFormatH3M.h"

0
lib/Mapping/CMapService.h → lib/mapping/CMapService.h
View File

4
lib/Mapping/MapFormatH3M.cpp → lib/mapping/MapFormatH3M.cpp
View File

@ -15,8 +15,8 @@
#include "../CStopWatch.h" #include "../CStopWatch.h"
#include "../Filesystem/CResourceLoader.h" #include "../filesystem/CResourceLoader.h"
#include "../Filesystem/CInputStream.h" #include "../filesystem/CInputStream.h"
#include "CMap.h" #include "CMap.h"
#include "../CSpellHandler.h" #include "../CSpellHandler.h"

2
lib/Mapping/MapFormatH3M.h → lib/mapping/MapFormatH3M.h
View File

@ -17,7 +17,7 @@
#include "../int3.h" #include "../int3.h"
#include "../Filesystem/CBinaryReader.h" #include "../filesystem/CBinaryReader.h"
class CGHeroInstance; class CGHeroInstance;
class CArtifactInstance; class CArtifactInstance;

0
lib/RMG/CMapGenOptions.cpp → lib/rmg/CMapGenOptions.cpp
View File

0
lib/RMG/CMapGenOptions.h → lib/rmg/CMapGenOptions.h
View File

4
lib/RMG/CMapGenerator.cpp → lib/rmg/CMapGenerator.cpp
View File

@ -1,10 +1,10 @@
#include "StdInc.h" #include "StdInc.h"
#include "CMapGenerator.h" #include "CMapGenerator.h"
#include "../Mapping/CMap.h" #include "../mapping/CMap.h"
#include "../VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "../CGeneralTextHandler.h" #include "../CGeneralTextHandler.h"
#include "../Mapping/CMapEditManager.h" #include "../mapping/CMapEditManager.h"
#include "../CObjectHandler.h" #include "../CObjectHandler.h"
#include "../CDefObjInfoHandler.h" #include "../CDefObjInfoHandler.h"
#include "../GameConstants.h" #include "../GameConstants.h"

0
lib/RMG/CMapGenerator.h → lib/rmg/CMapGenerator.h
View File

8
server/CGameHandler.cpp
View File

@ -1,9 +1,9 @@
#include "StdInc.h" #include "StdInc.h"
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/Filesystem/CFileInfo.h" #include "../lib/filesystem/CFileInfo.h"
#include "../lib/int3.h" #include "../lib/int3.h"
#include "../lib/Mapping/CCampaignHandler.h" #include "../lib/mapping/CCampaignHandler.h"
#include "../lib/StartInfo.h" #include "../lib/StartInfo.h"
#include "../lib/CModHandler.h" #include "../lib/CModHandler.h"
#include "../lib/CArtHandler.h" #include "../lib/CArtHandler.h"
@ -20,7 +20,7 @@
#include "../lib/CondSh.h" #include "../lib/CondSh.h"
#include "../lib/NetPacks.h" #include "../lib/NetPacks.h"
#include "../lib/VCMI_Lib.h" #include "../lib/VCMI_Lib.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"
#include "../client/CSoundBase.h" #include "../client/CSoundBase.h"
#include "CGameHandler.h" #include "CGameHandler.h"

8
server/CVCMIServer.cpp
View File

@ -4,8 +4,8 @@
#include <boost/interprocess/mapped_region.hpp> #include <boost/interprocess/mapped_region.hpp>
#include <boost/interprocess/shared_memory_object.hpp> #include <boost/interprocess/shared_memory_object.hpp>
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/filesystem/CResourceLoader.h"
#include "../lib/Mapping/CCampaignHandler.h" #include "../lib/mapping/CCampaignHandler.h"
#include "../lib/CThreadHelper.h" #include "../lib/CThreadHelper.h"
#include "../lib/Connection.h" #include "../lib/Connection.h"
#include "../lib/CModHandler.h" #include "../lib/CModHandler.h"
@ -20,12 +20,12 @@
#include "zlib.h" #include "zlib.h"
#include "CVCMIServer.h" #include "CVCMIServer.h"
#include "../lib/StartInfo.h" #include "../lib/StartInfo.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/Interprocess.h" #include "../lib/Interprocess.h"
#include "../lib/VCMI_Lib.h" #include "../lib/VCMI_Lib.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"
#include "CGameHandler.h" #include "CGameHandler.h"
#include "../lib/Mapping/CMapInfo.h" #include "../lib/mapping/CMapInfo.h"
#include "../lib/CObjectHandler.h" #include "../lib/CObjectHandler.h"
#include "../lib/GameConstants.h" #include "../lib/GameConstants.h"

2
server/NetPacksServer.cpp
View File

@ -4,7 +4,7 @@
#include "CGameHandler.h" #include "CGameHandler.h"
#include "../lib/CObjectHandler.h" #include "../lib/CObjectHandler.h"
#include "../lib/IGameCallback.h" #include "../lib/IGameCallback.h"
#include "../lib/Mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/CGameState.h" #include "../lib/CGameState.h"
#include "../lib/BattleState.h" #include "../lib/BattleState.h"
#include "../lib/BattleAction.h" #include "../lib/BattleAction.h"