From 51e6961d087eb6d2a285c5741b0f884f1c83f33c Mon Sep 17 00:00:00 2001 From: DjWarmonger Date: Sun, 29 Dec 2013 15:48:56 +0000 Subject: [PATCH] Compile fix for MVS. --- AI/VCAI/Goals.cpp | 1 + client/CPreGame.cpp | 1 + lib/CGameState.h | 1 + lib/filesystem/AdapterLoaders.h | 11 +++++++++++ 4 files changed, 14 insertions(+) diff --git a/AI/VCAI/Goals.cpp b/AI/VCAI/Goals.cpp index 341b5b10c..c72d00d91 100644 --- a/AI/VCAI/Goals.cpp +++ b/AI/VCAI/Goals.cpp @@ -2,6 +2,7 @@ #include "Goals.h" #include "VCAI.h" #include "Fuzzy.h" +#include "../../lib/mapping/CMap.h" //for victory conditions /* * Goals.cpp, part of VCMI engine diff --git a/client/CPreGame.cpp b/client/CPreGame.cpp index f1506ec89..4caeba3fc 100644 --- a/client/CPreGame.cpp +++ b/client/CPreGame.cpp @@ -42,6 +42,7 @@ #include "gui/CGuiHandler.h" #include "gui/CIntObjectClasses.h" #include "../lib/mapping/CMapService.h" +#include "../lib/mapping/CMap.h" /* * CPreGame.cpp, part of VCMI engine diff --git a/lib/CGameState.h b/lib/CGameState.h index 77b896976..512422468 100644 --- a/lib/CGameState.h +++ b/lib/CGameState.h @@ -60,6 +60,7 @@ class CGameInfo; struct QuestInfo; class CQuest; class CCampaignScenario; +struct EventCondition; namespace boost { diff --git a/lib/filesystem/AdapterLoaders.h b/lib/filesystem/AdapterLoaders.h index f5d6d94b2..e6cfef052 100644 --- a/lib/filesystem/AdapterLoaders.h +++ b/lib/filesystem/AdapterLoaders.h @@ -58,6 +58,17 @@ class DLL_LINKAGE CFilesystemList : public ISimpleResourceLoader std::set writeableLoaders; + //FIXME: this is only compile fix, should be removed in the end + CFilesystemList(CFilesystemList &) + { + //class is not copyable + } + CFilesystemList &operator=(CFilesystemList &) + { + //class is not copyable + return *this; + } + public: CFilesystemList(); ~CFilesystemList();