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

Project update, fix build

Browse Source 
(!) register types as usual too huge
This commit is contained in:
AlexVinS 2014-06-23 10:24:49 +04:00
parent 1921bd22d6
commit 46d92f11cb
5 changed files with 62 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/CMakeLists.txt
View File

@ -94,6 +94,7 @@ set(lib_SRCS
registerTypes/TypesClientPacks2.cpp registerTypes/TypesClientPacks2.cpp
registerTypes/TypesMapObjects1.cpp registerTypes/TypesMapObjects1.cpp
registerTypes/TypesMapObjects2.cpp registerTypes/TypesMapObjects2.cpp
registerTypes/TypesMapObjects3.cpp
registerTypes/TypesPregamePacks.cpp registerTypes/TypesPregamePacks.cpp
registerTypes/TypesServerPacks.cpp registerTypes/TypesServerPacks.cpp
) )

36
lib/VCMI_lib.cbp
View File

@ -91,8 +91,6 @@
<Unit filename="CCreatureHandler.h" /> <Unit filename="CCreatureHandler.h" />
<Unit filename="CCreatureSet.cpp" /> <Unit filename="CCreatureSet.cpp" />
<Unit filename="CCreatureSet.h" /> <Unit filename="CCreatureSet.h" />
<Unit filename="CDefObjInfoHandler.cpp" />
<Unit filename="CDefObjInfoHandler.h" />
<Unit filename="CGameInfoCallback.cpp" /> <Unit filename="CGameInfoCallback.cpp" />
<Unit filename="CGameInfoCallback.h" /> <Unit filename="CGameInfoCallback.h" />
<Unit filename="CGameInterface.cpp" /> <Unit filename="CGameInterface.cpp" />
@ -105,8 +103,6 @@
<Unit filename="CHeroHandler.h" /> <Unit filename="CHeroHandler.h" />
<Unit filename="CModHandler.cpp" /> <Unit filename="CModHandler.cpp" />
<Unit filename="CModHandler.h" /> <Unit filename="CModHandler.h" />
<Unit filename="CObjectHandler.cpp" />
<Unit filename="CObjectHandler.h" />
<Unit filename="CObstacleInstance.cpp" /> <Unit filename="CObstacleInstance.cpp" />
<Unit filename="CObstacleInstance.h" /> <Unit filename="CObstacleInstance.h" />
<Unit filename="CRandomGenerator.cpp" /> <Unit filename="CRandomGenerator.cpp" />
@ -185,6 +181,37 @@
<Unit filename="logging/CBasicLogConfigurator.h" /> <Unit filename="logging/CBasicLogConfigurator.h" />
<Unit filename="logging/CLogger.cpp" /> <Unit filename="logging/CLogger.cpp" />
<Unit filename="logging/CLogger.h" /> <Unit filename="logging/CLogger.h" />
<Unit filename="mapObjects/CArmedInstance.cpp" />
<Unit filename="mapObjects/CArmedInstance.h" />
<Unit filename="mapObjects/CBank.cpp" />
<Unit filename="mapObjects/CBank.h" />
<Unit filename="mapObjects/CGHeroInstance.cpp" />
<Unit filename="mapObjects/CGHeroInstance.h" />
<Unit filename="mapObjects/CGMarket.cpp" />
<Unit filename="mapObjects/CGMarket.h" />
<Unit filename="mapObjects/CGPandoraBox.cpp" />
<Unit filename="mapObjects/CGPandoraBox.h" />
<Unit filename="mapObjects/CGTownInstance.cpp" />
<Unit filename="mapObjects/CGTownInstance.h" />
<Unit filename="mapObjects/CObjectClassesHandler.cpp" />
<Unit filename="mapObjects/CObjectClassesHandler.h" />
<Unit filename="mapObjects/CObjectHandler.cpp" />
<Unit filename="mapObjects/CObjectHandler.h" />
<Unit filename="mapObjects/CQuest.cpp" />
<Unit filename="mapObjects/CQuest.h" />
<Unit filename="mapObjects/CRewardableConstructor.cpp" />
<Unit filename="mapObjects/CRewardableConstructor.h" />
<Unit filename="mapObjects/CRewardableObject.cpp" />
<Unit filename="mapObjects/CRewardableObject.h" />
<Unit filename="mapObjects/CommonConstructors.cpp" />
<Unit filename="mapObjects/CommonConstructors.h" />
<Unit filename="mapObjects/JsonRandom.cpp" />
<Unit filename="mapObjects/JsonRandom.h" />
<Unit filename="mapObjects/MapObjects.h" />
<Unit filename="mapObjects/MiscObjects.cpp" />
<Unit filename="mapObjects/MiscObjects.h" />
<Unit filename="mapObjects/ObjectTemplate.cpp" />
<Unit filename="mapObjects/ObjectTemplate.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" />
@ -205,6 +232,7 @@
<Unit filename="registerTypes/TypesClientPacks2.cpp" /> <Unit filename="registerTypes/TypesClientPacks2.cpp" />
<Unit filename="registerTypes/TypesMapObjects1.cpp" /> <Unit filename="registerTypes/TypesMapObjects1.cpp" />
<Unit filename="registerTypes/TypesMapObjects2.cpp" /> <Unit filename="registerTypes/TypesMapObjects2.cpp" />
<Unit filename="registerTypes/TypesMapObjects3.cpp" />
<Unit filename="registerTypes/TypesPregamePacks.cpp" /> <Unit filename="registerTypes/TypesPregamePacks.cpp" />
<Unit filename="registerTypes/TypesServerPacks.cpp" /> <Unit filename="registerTypes/TypesServerPacks.cpp" />
<Unit filename="rmg/CMapGenOptions.cpp" /> <Unit filename="rmg/CMapGenOptions.cpp" />

2
lib/mapObjects/CObjectClassesHandler.h
View File

@ -93,7 +93,7 @@ public:
class CGObjectInstance; class CGObjectInstance;
class AObjectTypeHandler : public boost::noncopyable class DLL_LINKAGE AObjectTypeHandler : public boost::noncopyable
{ {
RandomMapInfo rmgInfo; RandomMapInfo rmgInfo;

9
lib/registerTypes/TypesMapObjects1.cpp
View File

@ -18,15 +18,6 @@
#include "../NetPacks.h" #include "../NetPacks.h"
#include "../mapObjects/CObjectClassesHandler.h" #include "../mapObjects/CObjectClassesHandler.h"
template void registerTypesMapObjectTypes<CISer<CConnection>>(CISer<CConnection>& s);
template void registerTypesMapObjectTypes<COSer<CConnection>>(COSer<CConnection>& s);
template void registerTypesMapObjectTypes<CISer<CMemorySerializer>>(CISer<CMemorySerializer>& s);
template void registerTypesMapObjectTypes<COSer<CMemorySerializer>>(COSer<CMemorySerializer>& s);
template void registerTypesMapObjectTypes<CSaveFile>(CSaveFile & s);
template void registerTypesMapObjectTypes<CLoadFile>(CLoadFile & s);
template void registerTypesMapObjectTypes<CTypeList>(CTypeList & s);
template void registerTypesMapObjectTypes<CLoadIntegrityValidator>(CLoadIntegrityValidator & s);
template void registerTypesMapObjects1<CISer<CConnection>>(CISer<CConnection>& s); template void registerTypesMapObjects1<CISer<CConnection>>(CISer<CConnection>& s);
template void registerTypesMapObjects1<COSer<CConnection>>(COSer<CConnection>& s); template void registerTypesMapObjects1<COSer<CConnection>>(COSer<CConnection>& s);
template void registerTypesMapObjects1<CISer<CMemorySerializer>>(CISer<CMemorySerializer>& s); template void registerTypesMapObjects1<CISer<CMemorySerializer>>(CISer<CMemorySerializer>& s);

28
lib/registerTypes/TypesMapObjects3.cpp Normal file
View File

@ -0,0 +1,28 @@
#include "StdInc.h"
#include "RegisterTypes.h"
#include "../mapping/CMapInfo.h"
#include "../StartInfo.h"
#include "../BattleState.h"
#include "../CGameState.h"
#include "../mapping/CMap.h"
#include "../CModHandler.h"
#include "../mapObjects/CObjectHandler.h"
#include "../CCreatureHandler.h"
#include "../VCMI_Lib.h"
#include "../CArtHandler.h"
#include "../CHeroHandler.h"
#include "../CSpellHandler.h"
#include "../CTownHandler.h"
#include "../mapping/CCampaignHandler.h"
#include "../NetPacks.h"
#include "../mapObjects/CObjectClassesHandler.h"
template void registerTypesMapObjectTypes<CISer<CConnection>>(CISer<CConnection>& s);
template void registerTypesMapObjectTypes<COSer<CConnection>>(COSer<CConnection>& s);
template void registerTypesMapObjectTypes<CISer<CMemorySerializer>>(CISer<CMemorySerializer>& s);
template void registerTypesMapObjectTypes<COSer<CMemorySerializer>>(COSer<CMemorySerializer>& s);
template void registerTypesMapObjectTypes<CSaveFile>(CSaveFile & s);
template void registerTypesMapObjectTypes<CLoadFile>(CLoadFile & s);
template void registerTypesMapObjectTypes<CTypeList>(CTypeList & s);
template void registerTypesMapObjectTypes<CLoadIntegrityValidator>(CLoadIntegrityValidator & s);