Even more fixes for random crashes in some less common cases (DF in the menu, etc...)

examples/buildingsdump.cpp

@@ -109,6 +109,10 @@ int main (int argc,const char* argv[])
     {
         cout << "usage:" << endl;
         cout << argv[0] << " object_name [number of lines]" << endl;
+        #ifndef LINUX_BUILD
+            cout << "Done. Press any key to continue" << endl;
+            cin.ignore();
+        #endif
         return 0;
     }
     int lines = 16;

examples/creaturedump.cpp

@@ -315,10 +315,25 @@ int main (void)
         return 1;
     }
     
+    uint32_t numCreatures;
+    if(!DF.InitReadCreatures(numCreatures))
+    {
+        cerr << "Can't get creatures" << endl;
+        #ifndef LINUX_BUILD
+            cin.ignore();
+        #endif
+        return 1;
+    }
+    if(!numCreatures)
+    {
+        cerr << "No creatures to print" << endl;
+        #ifndef LINUX_BUILD
+            cin.ignore();
+        #endif
+        return 1;
+    }
         
     DF.ReadItemTypes(itemTypes);
-    
-   
     DF.ReadPlantMatgloss(mat.plantMat);
     DF.ReadWoodMatgloss(mat.woodMat);
     DF.ReadStoneMatgloss(mat.stoneMat);
@@ -338,12 +353,6 @@ int main (void)
         cerr << "Can't get name tables" << endl;
         return 1;
     }
-    uint32_t numCreatures;
-    if(!DF.InitReadCreatures(numCreatures))
-    {
-        cerr << "Can't get creatures" << endl;
-        return 1;
-    }
     DF.InitViewAndCursor();
     for(uint32_t i = 0; i < numCreatures; i++)
     {

examples/materialtest.cpp

@@ -24,6 +24,16 @@ int main (void)
         return 1;
     }
     
+    if(!DF.InitMap())
+    {
+        cerr << "No map loaded, it would be unsafe to enumerate materials" << endl;
+        #ifndef LINUX_BUILD
+            cin.ignore();
+        #endif
+        return 1;
+    }
+    DF.DestroyMap();
+    
     vector <DFHack::t_matgloss> Woods;
     DF.ReadWoodMatgloss(Woods);
     
@@ -46,7 +56,7 @@ int main (void)
     cout << "Creature: " << CreatureTypes[0].id << endl;
     cout << endl;
     cout << "Dumping all stones!" << endl;
-    for(int i = 0; i < Stones.size();i++)
+    for(uint32_t i = 0; i < Stones.size();i++)
     {
         cout << Stones[i].id << "$" << endl;;
     }

examples/renamer.cpp

@@ -450,7 +450,7 @@ start:
                     uint32_t nickname = mem->getOffset("creature_name") + mem->getOffset("name_nickname");
                     p->writeSTLString(toChange.origin+nickname,changeString);
                 }
-                catch (DFHack::Error::MissingMemoryDefinition& e)
+                catch (DFHack::Error::MissingMemoryDefinition&)
                 {
                     cerr << "Writing creature nicknames unsupported in this version!" << endl;
                 }
@@ -462,7 +462,7 @@ start:
                     uint32_t custom_prof = mem->getOffset("creature_custom_profession");
                     p->writeSTLString(toChange.origin+custom_prof,changeString);
                 }
-                catch (DFHack::Error::MissingMemoryDefinition& e)
+                catch (DFHack::Error::MissingMemoryDefinition&)
                 {
                     cerr << "Writing creature custom profession unsupported in this version!" << endl;
                 }

library/DFHackAPI.cpp

@@ -259,7 +259,7 @@ bool API::InitMap()
         off->y_count_offset = y_count_offset;
         off->z_count_offset = z_count_offset;
         full_barrier
-        const uint32_t cmd = Maps::MAP_INIT + d->maps_module << 16;
+        const uint32_t cmd = Maps::MAP_INIT + (d->maps_module << 16);
         g_pProcess->SetAndWait(cmd);
         //cerr << "Map acceleration enabled!" << endl;
     }
@@ -920,7 +920,7 @@ bool API::InitReadEffects ( uint32_t & numeffects )
     return true;
 }
 
-bool API::ReadEffect(const int32_t index, t_effect_df40d & effect)
+bool API::ReadEffect(const uint32_t index, t_effect_df40d & effect)
 {
     if(!d->effectsInited)
         return false;
@@ -935,7 +935,7 @@ bool API::ReadEffect(const int32_t index, t_effect_df40d & effect)
 }
 
 // use with care!
-bool API::WriteEffect(const int32_t index, const t_effect_df40d & effect)
+bool API::WriteEffect(const uint32_t index, const t_effect_df40d & effect)
 {
     if(!d->effectsInited)
         return false;

library/DFHackAPI.h

@@ -192,8 +192,8 @@ namespace DFHack
          * Effects like mist, dragonfire or dust
          */
         bool InitReadEffects ( uint32_t & numeffects );
-        bool ReadEffect(const int32_t index, t_effect_df40d & effect);
+        bool ReadEffect(const uint32_t index, t_effect_df40d & effect);
-        bool WriteEffect(const int32_t index, const t_effect_df40d & effect);
+        bool WriteEffect(const uint32_t index, const t_effect_df40d & effect);
         void FinishReadEffects();
         
         /*

library/DFMemInfoManager.cpp

@@ -28,7 +28,7 @@ using namespace DFHack;
 MemInfoManager::~MemInfoManager()
 {
     // for each in std::vector<memory_info*> meminfo;, delete
-    for(int i = 0; i < meminfo.size();i++)
+    for(uint32_t i = 0; i < meminfo.size();i++)
     {
         delete meminfo[i];
     }
@@ -248,7 +248,7 @@ bool MemInfoManager::loadFile(string path_to_xml)
     // transform elements
     {
         // trash existing list
-        for(int i = 0; i < meminfo.size(); i++)
+        for(uint32_t i = 0; i < meminfo.size(); i++)
         {
             delete meminfo[i];
         }

library/DFProcess-windows-SHM.cpp

@@ -354,7 +354,7 @@ bool SHMProcess::Private::validate(vector <memory_info *> & known_versions)
         {
             pe_timestamp = (*it)->getHexValue("pe_timestamp");
         }
-        catch(Error::MissingMemoryDefinition& e)
+        catch(Error::MissingMemoryDefinition&)
         {
             continue;
         }

library/DFProcess-windows.cpp

@@ -97,7 +97,7 @@ NormalProcess::NormalProcess(uint32_t pid, vector <memory_info *> & known_versio
         {
             pe_timestamp = (*it)->getHexValue("pe_timestamp");
         }
-        catch(Error::MissingMemoryDefinition& e)
+        catch(Error::MissingMemoryDefinition&)
         {
             continue;
         }