diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml index 212c87b7d..537e2a2da 100644 --- a/data/Memory-ng.xml +++ b/data/Memory-ng.xml @@ -1867,7 +1867,7 @@
-
+
diff --git a/library/DFTileTypes.cpp b/library/DFTileTypes.cpp new file mode 100644 index 000000000..3064aa007 --- /dev/null +++ b/library/DFTileTypes.cpp @@ -0,0 +1,31 @@ +// vim: sts=4 sta et shiftwidth=4: +#include "dfhack/DFIntegers.h" +#include "dfhack/DFTileTypes.h" +#include "dfhack/DFExport.h" + +namespace DFHack { + //set tile class string lookup table (e.g. for printing to user) +#define X(name,comment) #name, + DFHACK_EXPORT const char * TileClassString[tileclass_count+1] = { + TILECLASS_MACRO + 0 + }; +#undef X + + //string lookup table (e.g. for printing to user) +#define X(name,comment) #name, + DFHACK_EXPORT const char * TileMaterialString[tilematerial_count+1] = { + TILEMATERIAL_MACRO + 0 + }; +#undef X + + //string lookup table (e.g. for printing to user) +#define X(name,comment) #name, + DFHACK_EXPORT const char * TileSpecialString[tilespecial_count+1] = { + TILESPECIAL_MACRO + 0 + }; +#undef X + +} diff --git a/tools/supported/weather.cpp b/tools/supported/weather.cpp index 5ded20649..8e8a936bc 100644 --- a/tools/supported/weather.cpp +++ b/tools/supported/weather.cpp @@ -114,6 +114,7 @@ int main (int argc, char** argv) cin.ignore(); } #endif + DF->Resume(); DF->Detach(); return 0; }