@@ -1,6 +1,8 @@
#ifndef CGAMESTATE_H
#define CGAMESTATE_H
#include "global.h"
+#include "../hch/CCreatureHandler.h"
+#include "lib/VCMI_Lib.h"
#include <set>
#include <vector>
#ifdef _WIN32
@@ -237,7 +237,7 @@ public:
void loadPointer(T &data)
{
std::cout<<"Allocating memory for pointer!"<<std::endl;
- typedef boost::remove_pointer<T>::type npT;
+ typedef typename boost::remove_pointer<T>::type npT;
data = new npT;
*this >> *data;
}
@@ -1,3 +1,5 @@
+#ifndef VCMI_LIB_H
+#define VCMI_LIB_H
#include "../global.h"
class CLodHandler;
@@ -55,7 +57,13 @@ public:
//StartInfo scenarioOps;
};
+#ifndef __GNUC__
+DLL_EXPORT LibClasses * VLC;
+#else
extern DLL_EXPORT LibClasses * VLC;
+#endif
-DLL_EXPORT void initDLL(CLodHandler *b);
+DLL_EXPORT void initDLL(CLodHandler *b);
+
+#endif //VCMI_LIB_H
@@ -3,6 +3,7 @@
#include "../CGameState.h"
#include "../lib/Connection.h"
+#include <boost/thread.hpp>
class CVCMIServer;
class CGameState;
//class CConnection;