summaryrefslogtreecommitdiff
path: root/common.h
diff options
context:
space:
mode:
authorPetr Mrázek2011-05-18 21:47:01 +0000
committerPetr Mrázek2011-05-18 21:47:01 +0000
commit053e3dafbb59c27d8464aded9d1942ac7d7c35b8 (patch)
treec79444207b3b03a1fe307c57ee8ddb7d6a5d5f38 /common.h
parent244db2cf0b316c58f52fe530a397455b9088c833 (diff)
downloadstonesense-053e3dafbb59c27d8464aded9d1942ac7d7c35b8.tar.gz
stonesense-053e3dafbb59c27d8464aded9d1942ac7d7c35b8.tar.bz2
stonesense-053e3dafbb59c27d8464aded9d1942ac7d7c35b8.tar.xz
Fix for current dfhack (0.5.14). linux side only.
Diffstat (limited to 'common.h')
-rw-r--r--common.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/common.h b/common.h
index bc3d563..a99a5f3 100644
--- a/common.h
+++ b/common.h
@@ -2,11 +2,11 @@
#pragma warning( disable : 4312 ) //64-bit portability issue
#pragma warning( disable : 4996 ) //'deprecated' function warning
#pragma warning( disable : 4251 ) //'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
-#define SKIP_DFHACK_STDINT
#include <assert.h>
#include <vector>
#include <map>
+
#include <allegro5/allegro.h>
#include <allegro5/allegro_primitives.h>
#include <allegro5/allegro_font.h>
@@ -15,14 +15,14 @@
#include <allegro5/allegro_native_dialog.h>
#include <allegro5/allegro_opengl.h>
#include <allegro5/utf8.h>
+// allegro leaks X headers, undef some of it here:
+#undef TileShape
+// allegro also leaks stdint.h and some weird equivalent of it on windows. let's disable the copy leaked by dfhack.
+#define SKIP_DFHACK_STDINT
-using namespace std;
-
-#include <DFHack.h>
+#include <DFHack.h>
#include <dfhack/DFTileTypes.h>
-using namespace DFHack;
-
#include "commonTypes.h"
#include "Block.h"
#include <stdio.h>
@@ -247,3 +247,5 @@ extern ALLEGRO_MOUSE_STATE mouse;
extern int randomCube[RANDOM_CUBE][RANDOM_CUBE][RANDOM_CUBE];
ALLEGRO_COLOR premultiply(ALLEGRO_COLOR input);
+using namespace DFHack;
+using namespace std;