More warning-squashing

dfhack/include/Tranquility.h

@@ -11,6 +11,8 @@
     #pragma warning( disable: 4996 )
     // disable stupid
     #pragma warning( disable: 4800 )
+    // disable more stupid
+    #pragma warning( disable: 4068 )
 #endif
 
 #endif

dfhack/modules/Maps.cpp

@@ -730,7 +730,7 @@ bool Maps::ReadLocalFeatures( std::map <planecoord, std::vector<t_feature *> > &
         uint32_t array_elem = p->readDWord(base + (region_x_plus8 / 16) * 4);
         
         // 16B structs, second DWORD of the struct is a pointer
-        uint32_t wtf = p->readDWord(array_elem + ( sizeof_elem * (region_y_local/16)) + offset_elem); 
+        uint32_t wtf = p->readDWord(array_elem + ( sizeof_elem * ( (uint32_t)region_y_local/16)) + offset_elem); 
         if(wtf)
         {
             // wtf + sizeof(vector<ptr>) * crap;

dfhack/modules/Materials.cpp

@@ -353,7 +353,7 @@ std::string Materials::getDescription(t_material & mat)
 		case 0:
 			if(mat.index>=0)
 			{
-				if(mat.index<=this->inorganic.size())
+				if(uint32_t(mat.index) <= this->inorganic.size())
 				{
 					out.append(this->inorganic[mat.index].id);
 					out.append(" bar");

dfhack/python/DF_GUI.cpp

@@ -24,6 +24,7 @@ distribution.
 
 #ifndef __DFGUI__
 #define __DFGUI__
+#include "Tranquility.h"
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 
 #include "Python.h"

dfhack/python/DF_Maps.cpp

@@ -24,6 +24,7 @@ distribution.
 
 #ifndef __DFMAPS__
 #define __DFMAPS__
+#include "Tranquility.h"
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 
 #include "Python.h"

dfhack/python/DF_MemInfo.cpp

@@ -24,6 +24,7 @@ distribution.
 
 #ifndef __DF_MEMINFO__
 #define __DF_MEMINFO__
+#include "Tranquility.h"
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 
 #include "Python.h"
@@ -32,6 +33,7 @@ distribution.
 using namespace std;
 
 #include "Export.h"
+#include "integers.h"
 #include "DFMemInfo.h"
 
 using namespace DFHack;

examples/creaturedump.cpp

@@ -237,7 +237,6 @@ void printCreature(DFHack::API & DF, const DFHack::t_creature & creature)
         {
             cout << "mood: " << creature.mood << ", skill: " << mem->getSkill(creature.mood_skill) << endl;
             vector<DFHack::t_material> mymat;
-            char maintype[512];
             if(Creatures->ReadJob(&creature, mymat))
             {
                 for(unsigned int i = 0; i < mymat.size(); i++)

tools/moodump.cpp

@@ -92,7 +92,6 @@ int main (int numargs, char ** args)
 	unsigned int mat_end;
 	unsigned int j,k;
 	unsigned int matptr;
-	unsigned int tmp;
 
     Creatures->ReadCreature(i,temp);
 	if(temp.mood>=0)