mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
[c::b] renamed map subfolder to workaround dependency tracking bug
This commit is contained in:
alexvins
parent
2848fb6fef
commit
4bc2fd5519
@ -14,7 +14,7 @@
|
||||
#include "../../lib/CObjectHandler.h"
|
||||
#include "../../lib/Connection.h"
|
||||
#include "../../lib/CGameState.h"
|
||||
#include "../../lib/Map/CMap.h"
|
||||
#include "../../lib/Mapping/CMap.h"
|
||||
#include "../../lib/NetPacks.h"
|
||||
#include "../../lib/CondSh.h"
|
||||
#include "../../lib/CStopWatch.h"
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include "lib/BattleState.h"
|
||||
#include "client/CPlayerInterface.h"
|
||||
#include "client/Client.h"
|
||||
#include "lib/Map/CMap.h"
|
||||
#include "lib/Mapping/CMap.h"
|
||||
#include "lib/CBuildingHandler.h"
|
||||
#include "lib/CDefObjInfoHandler.h"
|
||||
#include "lib/CGeneralTextHandler.h"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include "../CCallback.h"
|
||||
#include "../lib/JsonNode.h"
|
||||
#include "../lib/Filesystem/CResourceLoader.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "../lib/CModHandler.h"
|
||||
#include "../lib/CObjectHandler.h"
|
||||
#include "../lib/CGameState.h"
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
#include "../CCreatureWindow.h"
|
||||
#include "../CVideoHandler.h"
|
||||
#include "../../lib/CTownHandler.h"
|
||||
#include "../../lib/Map/CMap.h"
|
||||
#include "../../lib/Mapping/CMap.h"
|
||||
|
||||
#include "CBattleAnimations.h"
|
||||
#include "CBattleInterfaceClasses.h"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
#include "../lib/CHeroHandler.h"
|
||||
#include "../lib/CObjectHandler.h"
|
||||
#include "../lib/CTownHandler.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "../lib/JsonNode.h"
|
||||
#include "mapHandler.h"
|
||||
#include "CPreGame.h"
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include "CMusicHandler.h"
|
||||
#include "../lib/CondSh.h"
|
||||
#include "../lib/NetPacks.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "../lib/VCMIDirs.h"
|
||||
#include "mapHandler.h"
|
||||
#include "../lib/CStopWatch.h"
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#include "../lib/CTownHandler.h"
|
||||
#include "../lib/CHeroHandler.h"
|
||||
#include "../lib/CObjectHandler.h"
|
||||
#include "../lib/Map/CCampaignHandler.h"
|
||||
#include "../lib/Mapping/CCampaignHandler.h"
|
||||
#include "../lib/CCreatureHandler.h"
|
||||
#include "../lib/JsonNode.h"
|
||||
#include "CMusicHandler.h"
|
||||
@ -24,7 +24,7 @@
|
||||
#include "Graphics.h"
|
||||
#include "../lib/Connection.h"
|
||||
#include "../lib/VCMIDirs.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "GUIClasses.h"
|
||||
#include "CPlayerInterface.h"
|
||||
#include "../CCallback.h"
|
||||
@ -41,7 +41,7 @@
|
||||
#include "../lib/GameConstants.h"
|
||||
#include "UIFramework/CGuiHandler.h"
|
||||
#include "UIFramework/CIntObjectClasses.h"
|
||||
#include "../lib/Map/CMapService.h"
|
||||
#include "../lib/Mapping/CMapService.h"
|
||||
|
||||
/*
|
||||
* CPreGame.cpp, part of VCMI engine
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include "../lib/StartInfo.h"
|
||||
#include "GUIClasses.h"
|
||||
#include "FunctionList.h"
|
||||
#include "../lib/Map/CMapInfo.h"
|
||||
#include "../lib/Mapping/CMapInfo.h"
|
||||
#include "../lib/RMG/CMapGenOptions.h"
|
||||
|
||||
/*
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#include "StdInc.h"
|
||||
|
||||
#include "CMusicHandler.h"
|
||||
#include "../lib/Map/CCampaignHandler.h"
|
||||
#include "../lib/Mapping/CCampaignHandler.h"
|
||||
#include "../CCallback.h"
|
||||
#include "../lib/CConsoleHandler.h"
|
||||
#include "CGameInfo.h"
|
||||
@ -23,7 +23,7 @@
|
||||
#include "../lib/NetPacks.h"
|
||||
#include "../lib/VCMI_Lib.h"
|
||||
#include "../lib/VCMIDirs.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "../lib/JsonNode.h"
|
||||
#include "mapHandler.h"
|
||||
#include "../lib/CConfigHandler.h"
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
#include "../lib/CSpellHandler.h"
|
||||
#include "../lib/CTownHandler.h"
|
||||
#include "../lib/CondSh.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "mapHandler.h"
|
||||
#include "../lib/CStopWatch.h"
|
||||
#include "../lib/NetPacks.h"
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
#include "../lib/CHeroHandler.h"
|
||||
#include "../lib/CObjectHandler.h"
|
||||
#include "../lib/VCMI_Lib.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "../lib/VCMIDirs.h"
|
||||
#include "../lib/CSpellHandler.h"
|
||||
#include "CSoundBase.h"
|
||||
@ -22,7 +22,7 @@
|
||||
#include "../lib/CConfigHandler.h"
|
||||
#include "UIFramework/SDL_Extensions.h"
|
||||
#include "BattleInterface/CBattleInterface.h"
|
||||
#include "../lib/Map/CCampaignHandler.h"
|
||||
#include "../lib/Mapping/CCampaignHandler.h"
|
||||
#include "../lib/CGameState.h"
|
||||
#include "../lib/BattleState.h"
|
||||
#include "../lib/GameConstants.h"
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include "../lib/CTownHandler.h"
|
||||
#include "Graphics.h"
|
||||
#include "../lib/CObjectHandler.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "CDefHandler.h"
|
||||
#include "../lib/CConfigHandler.h"
|
||||
#include "../lib/CGeneralTextHandler.h"
|
||||
|
||||
@ -267,7 +267,7 @@ void CGrowingArtifact::levelUpArtifact (CArtifactInstance * art)
|
||||
|
||||
CArtHandler::CArtHandler()
|
||||
{
|
||||
VLC->arth = this;
|
||||
//VLC->arth = this;
|
||||
|
||||
// War machines are the default big artifacts.
|
||||
for (ui32 i = 3; i <= 6; i++)
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#include "CGameState.h"
|
||||
|
||||
#include <boost/random/linear_congruential.hpp>
|
||||
#include "Map/CCampaignHandler.h"
|
||||
#include "Mapping/CCampaignHandler.h"
|
||||
#include "CDefObjInfoHandler.h"
|
||||
#include "CArtHandler.h"
|
||||
#include "CBuildingHandler.h"
|
||||
@ -15,12 +15,12 @@
|
||||
#include "CModHandler.h"
|
||||
#include "VCMI_Lib.h"
|
||||
#include "Connection.h"
|
||||
#include "Map/CMap.h"
|
||||
#include "Map/CMapService.h"
|
||||
#include "Mapping/CMap.h"
|
||||
#include "Mapping/CMapService.h"
|
||||
#include "StartInfo.h"
|
||||
#include "NetPacks.h"
|
||||
#include "RegisterTypes.h"
|
||||
#include "Map/CMapInfo.h"
|
||||
#include "Mapping/CMapInfo.h"
|
||||
#include "BattleState.h"
|
||||
#include "JsonNode.h"
|
||||
#include "Filesystem/CResourceLoader.h"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
//#ifndef _MSC_VER
|
||||
#include "CCreatureHandler.h"
|
||||
#include "VCMI_Lib.h"
|
||||
#include "Map/CMap.h"
|
||||
#include "Mapping/CMap.h"
|
||||
//#endif
|
||||
|
||||
#include "HeroBonus.h"
|
||||
|
||||
@ -1,79 +1,79 @@
|
||||
project(libvcmi)
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
|
||||
include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/lib)
|
||||
include_directories(${Boost_INCLUDE_DIRS} ${SDL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
||||
|
||||
set(lib_SRCS
|
||||
Filesystem/CBinaryReader.cpp
|
||||
Filesystem/CFilesystemLoader.cpp
|
||||
Filesystem/CMemoryStream.cpp
|
||||
Filesystem/CFileInfo.cpp
|
||||
Filesystem/CLodArchiveLoader.cpp
|
||||
Filesystem/CResourceLoader.cpp
|
||||
Filesystem/CFileInputStream.cpp
|
||||
Filesystem/CCompressedStream.cpp
|
||||
Map/CCampaignHandler.cpp
|
||||
Map/CMap.cpp
|
||||
Map/CMapInfo.cpp
|
||||
Map/CMapService.cpp
|
||||
RMG/CMapGenOptions.cpp
|
||||
BattleAction.cpp
|
||||
BattleHex.cpp
|
||||
BattleState.cpp
|
||||
CArtHandler.cpp
|
||||
CBattleCallback.cpp
|
||||
CBuildingHandler.cpp
|
||||
CConfigHandler.cpp
|
||||
CConsoleHandler.cpp
|
||||
CCreatureHandler.cpp
|
||||
CCreatureSet.cpp
|
||||
CDefObjInfoHandler.cpp
|
||||
CGameInterface.cpp
|
||||
CGameState.cpp
|
||||
CGeneralTextHandler.cpp
|
||||
CHeroHandler.cpp
|
||||
CLogger.cpp
|
||||
CModHandler.cpp
|
||||
CObjectHandler.cpp
|
||||
CObstacleInstance.cpp
|
||||
Connection.cpp
|
||||
CSpellHandler.cpp
|
||||
CThreadHelper.cpp
|
||||
CTownHandler.cpp
|
||||
HeroBonus.cpp
|
||||
IGameCallback.cpp
|
||||
JsonNode.cpp
|
||||
NetPacksLib.cpp
|
||||
ResourceSet.cpp
|
||||
VCMI_Lib.cpp
|
||||
)
|
||||
|
||||
set(lib_HEADERS
|
||||
Filesystem/CInputStream.h
|
||||
Filesystem/ISimpleResourceLoader.h
|
||||
AI_Base.h
|
||||
CondSh.h
|
||||
ConstTransitivePtr.h
|
||||
CScriptingModule.h
|
||||
CStopWatch.h
|
||||
GameConstants.h
|
||||
StringConstants.h
|
||||
IGameEventsReceiver.h
|
||||
int3.h
|
||||
Interprocess.h
|
||||
NetPacks.h
|
||||
RegisterTypes.h
|
||||
StartInfo.h
|
||||
UnlockGuard.h
|
||||
VCMIDirs.h
|
||||
vcmi_endian.h
|
||||
)
|
||||
|
||||
add_library(vcmi SHARED ${lib_SRCS} ${lib_HEADERS})
|
||||
set_target_properties(vcmi PROPERTIES XCODE_ATTRIBUTE_LD_DYLIB_INSTALL_NAME "@executable_path/libvcmi.dylib")
|
||||
target_link_libraries(vcmi ${Boost_LIBRARIES} ${SDL_LIBRARY} ${ZLIB_LIBRARIES})
|
||||
|
||||
if (NOT APPLE) # Already inside vcmiclient bundle
|
||||
install(TARGETS vcmi DESTINATION ${LIB_DIR})
|
||||
endif()
|
||||
project(libvcmi)
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
|
||||
include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/lib)
|
||||
include_directories(${Boost_INCLUDE_DIRS} ${SDL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
||||
|
||||
set(lib_SRCS
|
||||
Filesystem/CBinaryReader.cpp
|
||||
Filesystem/CFilesystemLoader.cpp
|
||||
Filesystem/CMemoryStream.cpp
|
||||
Filesystem/CFileInfo.cpp
|
||||
Filesystem/CLodArchiveLoader.cpp
|
||||
Filesystem/CResourceLoader.cpp
|
||||
Filesystem/CFileInputStream.cpp
|
||||
Filesystem/CCompressedStream.cpp
|
||||
Mapping/CCampaignHandler.cpp
|
||||
Mapping/CMap.cpp
|
||||
Mapping/CMapInfo.cpp
|
||||
Mapping/CMapService.cpp
|
||||
RMG/CMapGenOptions.cpp
|
||||
BattleAction.cpp
|
||||
BattleHex.cpp
|
||||
BattleState.cpp
|
||||
CArtHandler.cpp
|
||||
CBattleCallback.cpp
|
||||
CBuildingHandler.cpp
|
||||
CConfigHandler.cpp
|
||||
CConsoleHandler.cpp
|
||||
CCreatureHandler.cpp
|
||||
CCreatureSet.cpp
|
||||
CDefObjInfoHandler.cpp
|
||||
CGameInterface.cpp
|
||||
CGameState.cpp
|
||||
CGeneralTextHandler.cpp
|
||||
CHeroHandler.cpp
|
||||
CLogger.cpp
|
||||
CModHandler.cpp
|
||||
CObjectHandler.cpp
|
||||
CObstacleInstance.cpp
|
||||
Connection.cpp
|
||||
CSpellHandler.cpp
|
||||
CThreadHelper.cpp
|
||||
CTownHandler.cpp
|
||||
HeroBonus.cpp
|
||||
IGameCallback.cpp
|
||||
JsonNode.cpp
|
||||
NetPacksLib.cpp
|
||||
ResourceSet.cpp
|
||||
VCMI_Lib.cpp
|
||||
)
|
||||
|
||||
set(lib_HEADERS
|
||||
Filesystem/CInputStream.h
|
||||
Filesystem/ISimpleResourceLoader.h
|
||||
AI_Base.h
|
||||
CondSh.h
|
||||
ConstTransitivePtr.h
|
||||
CScriptingModule.h
|
||||
CStopWatch.h
|
||||
GameConstants.h
|
||||
StringConstants.h
|
||||
IGameEventsReceiver.h
|
||||
int3.h
|
||||
Interprocess.h
|
||||
NetPacks.h
|
||||
RegisterTypes.h
|
||||
StartInfo.h
|
||||
UnlockGuard.h
|
||||
VCMIDirs.h
|
||||
vcmi_endian.h
|
||||
)
|
||||
|
||||
add_library(vcmi SHARED ${lib_SRCS} ${lib_HEADERS})
|
||||
set_target_properties(vcmi PROPERTIES XCODE_ATTRIBUTE_LD_DYLIB_INSTALL_NAME "@executable_path/libvcmi.dylib")
|
||||
target_link_libraries(vcmi ${Boost_LIBRARIES} ${SDL_LIBRARY} ${ZLIB_LIBRARIES})
|
||||
|
||||
if (NOT APPLE) # Already inside vcmiclient bundle
|
||||
install(TARGETS vcmi DESTINATION ${LIB_DIR})
|
||||
endif()
|
||||
|
||||
@ -88,8 +88,6 @@ void CIdentifierStorage::finalize() const
|
||||
|
||||
CModHandler::CModHandler()
|
||||
{
|
||||
VLC->modh = this;
|
||||
|
||||
for (int i = 0; i < GameConstants::RESOURCE_QUANTITY; ++i)
|
||||
{
|
||||
identifiers.registerObject("resource." + GameConstants::RESOURCE_NAMES[i], i);
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#include "CGameState.h"
|
||||
#include "NetPacks.h"
|
||||
#include "StartInfo.h"
|
||||
#include "Map/CMap.h"
|
||||
#include "Mapping/CMap.h"
|
||||
#include <SDL_stdinc.h>
|
||||
#include "CBuildingHandler.h"
|
||||
#include "JsonNode.h"
|
||||
@ -2484,11 +2484,11 @@ void CGVisitableOPH::onHeroVisit( const CGHeroInstance * h ) const
|
||||
onNAHeroVisit(h->id, false);
|
||||
switch(ID)
|
||||
{
|
||||
case 102: //tree
|
||||
case 4: //arena
|
||||
case 41://library
|
||||
case 47: //School of Magic
|
||||
case 107://School of War
|
||||
case Obj::TREE_OF_KNOWLEDGE:
|
||||
case Obj::ARENA:
|
||||
case Obj::LIBRARY_OF_ENLIGHTENMENT:
|
||||
case Obj::SCHOOL_OF_MAGIC:
|
||||
case Obj::SCHOOL_OF_WAR:
|
||||
break;
|
||||
default:
|
||||
cb->setObjProperty(id, ObjProperty::VISITORS, h->id); //add to the visitors
|
||||
@ -3439,10 +3439,10 @@ ui32 CGMine::defaultResProduction()
|
||||
{
|
||||
switch(producedResource)
|
||||
{
|
||||
case 0: //wood
|
||||
case 2: //ore
|
||||
case Res::WOOD:
|
||||
case Res::ORE:
|
||||
return 2;
|
||||
case 6: //gold
|
||||
case Res::GOLD:
|
||||
return 1000;
|
||||
default:
|
||||
return 1;
|
||||
@ -3630,8 +3630,8 @@ void CGTeleport::onHeroVisit( const CGHeroInstance * h ) const
|
||||
switch(ID)
|
||||
{
|
||||
case Obj::MONOLITH1: //one way - find corresponding exit monolith
|
||||
if(vstd::contains(objs,44) && vstd::contains(objs[44],subID) && objs[44][subID].size())
|
||||
destinationid = objs[44][subID][rand()%objs[44][subID].size()];
|
||||
if(vstd::contains(objs,Obj::MONOLITH2) && vstd::contains(objs[Obj::MONOLITH2],subID) && objs[Obj::MONOLITH2][subID].size())
|
||||
destinationid = objs[Obj::MONOLITH2][subID][rand()%objs[Obj::MONOLITH2][subID].size()];
|
||||
else
|
||||
tlog2 << "Cannot find corresponding exit monolith for "<< id << std::endl;
|
||||
break;
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
#include "Connection.h"
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#include "../lib/RegisterTypes.h"
|
||||
#include "RegisterTypes.h"
|
||||
#endif
|
||||
|
||||
//for smart objs serialization over net
|
||||
#include "../lib/Map/CMapInfo.h"
|
||||
#include "Mapping/CMapInfo.h"
|
||||
#include "StartInfo.h"
|
||||
#include "BattleState.h"
|
||||
#include "CGameState.h"
|
||||
#include "Map/CMap.h"
|
||||
#include "Mapping/CMap.h"
|
||||
#include "CModHandler.h"
|
||||
#include "CObjectHandler.h"
|
||||
#include "CCreatureHandler.h"
|
||||
@ -19,7 +19,7 @@
|
||||
#include "CHeroHandler.h"
|
||||
#include "CSpellHandler.h"
|
||||
#include "CTownHandler.h"
|
||||
#include "Map/CCampaignHandler.h"
|
||||
#include "Mapping/CCampaignHandler.h"
|
||||
#include "NetPacks.h"
|
||||
#include "CDefObjInfoHandler.h"
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
#include "ConstTransitivePtr.h"
|
||||
#include "CCreatureSet.h" //for CStackInstance
|
||||
#include "CObjectHandler.h" //for CArmedInstance
|
||||
#include "Map/CCampaignHandler.h" //for CCampaignState
|
||||
#include "Mapping/CCampaignHandler.h" //for CCampaignState
|
||||
|
||||
const ui32 version = 733;
|
||||
const TSlot COMMANDER_SLOT_PLACEHOLDER = -2;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <boost/random/linear_congruential.hpp>
|
||||
|
||||
#include "CGameState.h"
|
||||
#include "Map/CMap.h"
|
||||
#include "Mapping/CMap.h"
|
||||
#include "CObjectHandler.h"
|
||||
#include "CHeroHandler.h"
|
||||
#include "StartInfo.h"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include "BattleAction.h"
|
||||
#include "HeroBonus.h"
|
||||
#include "CCreatureSet.h"
|
||||
#include "Map/CMapInfo.h"
|
||||
#include "Mapping/CMapInfo.h"
|
||||
#include "StartInfo.h"
|
||||
#include "ConstTransitivePtr.h"
|
||||
#include "int3.h"
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#include "CObjectHandler.h"
|
||||
#include "CModHandler.h"
|
||||
#include "VCMI_Lib.h"
|
||||
#include "Map/CMap.h"
|
||||
#include "Mapping/CMap.h"
|
||||
#include "CSpellHandler.h"
|
||||
#include "CCreatureHandler.h"
|
||||
#include "CGameState.h"
|
||||
|
||||
@ -24,6 +24,8 @@ class CModHandler;
|
||||
/// Loads and constructs several handlers
|
||||
class DLL_LINKAGE LibClasses
|
||||
{
|
||||
void callWhenDeserializing(); //should be called only by serialize !!!
|
||||
void makeNull(); //sets all handler pointers to null
|
||||
public:
|
||||
bool IS_AI_ENABLED; //VLC is the only object visible from both CMT and GeniusAI
|
||||
CArtHandler * arth;
|
||||
@ -40,11 +42,11 @@ public:
|
||||
~LibClasses();
|
||||
void init(); //uses standard config file
|
||||
void clear(); //deletes all handlers and its data
|
||||
void makeNull(); //sets all handler pointers to null
|
||||
|
||||
|
||||
void loadFilesystem();// basic initialization. should be called before init()
|
||||
|
||||
void callWhenDeserializing(); //should be called only by serialize !!!
|
||||
|
||||
template <typename Handler> void serialize(Handler &h, const int version)
|
||||
{
|
||||
h & heroh & arth & creh & townh & objh & dobjinfo & spellh & modh & IS_AI_ENABLED;;
|
||||
|
||||
@ -140,14 +140,14 @@
|
||||
<Unit filename="Interprocess.h" />
|
||||
<Unit filename="JsonNode.cpp" />
|
||||
<Unit filename="JsonNode.h" />
|
||||
<Unit filename="Map/CCampaignHandler.cpp" />
|
||||
<Unit filename="Map/CCampaignHandler.h" />
|
||||
<Unit filename="Map/CMap.cpp" />
|
||||
<Unit filename="Map/CMap.h" />
|
||||
<Unit filename="Map/CMapInfo.cpp" />
|
||||
<Unit filename="Map/CMapInfo.h" />
|
||||
<Unit filename="Map/CMapService.cpp" />
|
||||
<Unit filename="Map/CMapService.h" />
|
||||
<Unit filename="Mapping/CCampaignHandler.cpp" />
|
||||
<Unit filename="Mapping/CCampaignHandler.h" />
|
||||
<Unit filename="Mapping/CMap.cpp" />
|
||||
<Unit filename="Mapping/CMap.h" />
|
||||
<Unit filename="Mapping/CMapInfo.cpp" />
|
||||
<Unit filename="Mapping/CMapInfo.h" />
|
||||
<Unit filename="Mapping/CMapService.cpp" />
|
||||
<Unit filename="Mapping/CMapService.h" />
|
||||
<Unit filename="NetPacks.h" />
|
||||
<Unit filename="NetPacksLib.cpp" />
|
||||
<Unit filename="RMG/CMapGenOptions.cpp" />
|
||||
|
||||
@ -193,10 +193,10 @@
|
||||
<ClCompile Include="Filesystem\CLodArchiveLoader.cpp" />
|
||||
<ClCompile Include="Filesystem\CMemoryStream.cpp" />
|
||||
<ClCompile Include="Filesystem\CResourceLoader.cpp" />
|
||||
<ClCompile Include="Map\CCampaignHandler.cpp" />
|
||||
<ClCompile Include="Map\CMap.cpp" />
|
||||
<ClCompile Include="Map\CMapInfo.cpp" />
|
||||
<ClCompile Include="Map\CMapService.cpp" />
|
||||
<ClCompile Include="Mapping\CCampaignHandler.cpp" />
|
||||
<ClCompile Include="Mapping\CMap.cpp" />
|
||||
<ClCompile Include="Mapping\CMapInfo.cpp" />
|
||||
<ClCompile Include="Mapping\CMapService.cpp" />
|
||||
<ClCompile Include="RMG\CMapGenOptions.cpp" />
|
||||
<ClCompile Include="HeroBonus.cpp" />
|
||||
<ClCompile Include="CBattleCallback.cpp" />
|
||||
@ -254,10 +254,10 @@
|
||||
<ClInclude Include="Filesystem\CMemoryStream.h" />
|
||||
<ClInclude Include="Filesystem\CResourceLoader.h" />
|
||||
<ClInclude Include="Filesystem\ISimpleResourceLoader.h" />
|
||||
<ClInclude Include="Map\CCampaignHandler.h" />
|
||||
<ClInclude Include="Map\CMap.h" />
|
||||
<ClInclude Include="Map\CMapInfo.h" />
|
||||
<ClInclude Include="Map\CMapService.h" />
|
||||
<ClInclude Include="Mapping\CCampaignHandler.h" />
|
||||
<ClInclude Include="Mapping\CMap.h" />
|
||||
<ClInclude Include="Mapping\CMapInfo.h" />
|
||||
<ClInclude Include="Mapping\CMapService.h" />
|
||||
<ClInclude Include="RMG\CMapGenOptions.h" />
|
||||
<ClInclude Include="GameConstants.h" />
|
||||
<ClInclude Include="HeroBonus.h" />
|
||||
@ -279,4 +279,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#include "../lib/Filesystem/CResourceLoader.h"
|
||||
#include "../lib/Filesystem/CFileInfo.h"
|
||||
#include "../lib/int3.h"
|
||||
#include "../lib/Map/CCampaignHandler.h"
|
||||
#include "../lib/Mapping/CCampaignHandler.h"
|
||||
#include "../lib/StartInfo.h"
|
||||
#include "../lib/CModHandler.h"
|
||||
#include "../lib/CArtHandler.h"
|
||||
@ -20,7 +20,7 @@
|
||||
#include "../lib/CondSh.h"
|
||||
#include "../lib/NetPacks.h"
|
||||
#include "../lib/VCMI_Lib.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "../lib/VCMIDirs.h"
|
||||
#include "../client/CSoundBase.h"
|
||||
#include "CGameHandler.h"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#include "StdInc.h"
|
||||
|
||||
#include "../lib/Filesystem/CResourceLoader.h"
|
||||
#include "../lib/Map/CCampaignHandler.h"
|
||||
#include "../lib/Mapping/CCampaignHandler.h"
|
||||
#include "../lib/CThreadHelper.h"
|
||||
#include "../lib/Connection.h"
|
||||
#include "../lib/CModHandler.h"
|
||||
@ -16,12 +16,12 @@
|
||||
#include "zlib.h"
|
||||
#include "CVCMIServer.h"
|
||||
#include "../lib/StartInfo.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "../lib/Interprocess.h"
|
||||
#include "../lib/VCMI_Lib.h"
|
||||
#include "../lib/VCMIDirs.h"
|
||||
#include "CGameHandler.h"
|
||||
#include "../lib/Map/CMapInfo.h"
|
||||
#include "../lib/Mapping/CMapInfo.h"
|
||||
#include "../lib/CObjectHandler.h"
|
||||
#include "../lib/GameConstants.h"
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include "CGameHandler.h"
|
||||
#include "../lib/CObjectHandler.h"
|
||||
#include "../lib/IGameCallback.h"
|
||||
#include "../lib/Map/CMap.h"
|
||||
#include "../lib/Mapping/CMap.h"
|
||||
#include "../lib/CGameState.h"
|
||||
#include "../lib/BattleState.h"
|
||||
#include "../lib/BattleAction.h"
|
||||
|
||||
@ -2,15 +2,28 @@
|
||||
<CodeBlocks_workspace_file>
|
||||
<Workspace title="vcmi">
|
||||
<Project filename="lib/VCMI_lib.cbp" />
|
||||
<Project filename="client/VCMI_client.cbp" />
|
||||
<Project filename="server/VCMI_server.cbp" />
|
||||
<Project filename="client/VCMI_client.cbp">
|
||||
<Depends filename="lib/VCMI_lib.cbp" />
|
||||
</Project>
|
||||
<Project filename="server/VCMI_server.cbp">
|
||||
<Depends filename="lib/VCMI_lib.cbp" />
|
||||
</Project>
|
||||
<Project filename="AI/FuzzyLite/FuzzyLite.cbp" />
|
||||
<Project filename="AI/EmptyAI/EmptyAI.cbp" />
|
||||
<Project filename="AI/EmptyAI/EmptyAI.cbp">
|
||||
<Depends filename="lib/VCMI_lib.cbp" />
|
||||
</Project>
|
||||
<Project filename="AI/VCAI/VCAI.cbp">
|
||||
<Depends filename="lib/VCMI_lib.cbp" />
|
||||
<Depends filename="AI/FuzzyLite/FuzzyLite.cbp" />
|
||||
</Project>
|
||||
<Project filename="AI/StupidAI/StupidAI.cbp" />
|
||||
<Project filename="AI/BattleAI/BattleAI.cbp" />
|
||||
<Project filename="Scripting/ERM/ERM.cbp" />
|
||||
<Project filename="AI/StupidAI/StupidAI.cbp">
|
||||
<Depends filename="lib/VCMI_lib.cbp" />
|
||||
</Project>
|
||||
<Project filename="AI/BattleAI/BattleAI.cbp">
|
||||
<Depends filename="lib/VCMI_lib.cbp" />
|
||||
</Project>
|
||||
<Project filename="Scripting/ERM/ERM.cbp">
|
||||
<Depends filename="lib/VCMI_lib.cbp" />
|
||||
</Project>
|
||||
</Workspace>
|
||||
</CodeBlocks_workspace_file>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user