Merge branch 'master' of https://github.com/rofl0r/dfhack

tools/supported/cleanmap.cpp

@@ -8,8 +8,19 @@ using namespace std;
 
 #include <DFHack.h>
 
-int main (void)
+int main (int argc, char** argv)
 {
+
+    bool quiet = false;
+    for(int i = 1; i < argc; i++)
+    {
+        string test = argv[i];
+        if(test == "-q")
+        {
+            quiet = true;
+        }
+	}
+	
 	uint32_t x_max,y_max,z_max;
     uint32_t num_blocks = 0;
     uint32_t bytes_read = 0;
@@ -72,8 +83,11 @@ int main (void)
     }
     DF->Detach();
     #ifndef LINUX_BUILD
+	if (!quiet) 
+	{
 	    cout << "Done. Press any key to continue" << endl;
 	    cin.ignore();
+	}
     #endif
     return 0;
 }

tools/supported/forcepause.cpp

@@ -8,8 +8,18 @@ using namespace std;
 #include <DFHack.h>
 #include <dfhack/modules/Gui.h>
 
-int main (void)
+int main (int argc, char** argv)
 {
+    bool quiet = false;
+    for(int i = 1; i < argc; i++)
+    {
+        string test = argv[i];
+        if(test == "-q")
+        {
+            quiet = true;
+        }
+	}
+	
     DFHack::ContextManager DFMgr("Memory.xml");
     DFHack::Context *DF;
     try
@@ -21,7 +31,7 @@ int main (void)
     {
         cerr << e.what() << endl;
         #ifndef LINUX_BUILD
-            cin.ignore();
+        if(!quiet) cin.ignore();
         #endif
         return 1;
     }
@@ -33,7 +43,7 @@ int main (void)
     DF->Resume();
     #ifndef LINUX_BUILD
     cout << "Done. The current game frame will have to finish first. This can take some time on bugged maps." << endl;
-    cin.ignore();
+	if (!quiet) cin.ignore();
     #endif
     return 0;
 }

tools/supported/liquids.cpp

@@ -9,8 +9,17 @@ using namespace std;
 #include <DFHack.h>
 #include <dfhack/DFTileTypes.h>
 
-int main (void)
+int main (int argc, char** argv)
 {
+    bool quiet = false;
+    for(int i = 1; i < argc; i++)
+    {
+        string test = argv[i];
+        if(test == "-q")
+        {
+            quiet = true;
+        }
+	}
 	int32_t x,y,z;
     DFHack::designations40d designations;
     DFHack::tiletypes40d tiles;
@@ -460,8 +469,11 @@ int main (void)
     }
     DF->Detach();
     #ifndef LINUX_BUILD
+	if(!quiet)
+	{
 	    cout << "Done. Press any key to continue" << endl;
 	    cin.ignore();
+	}
     #endif
     return 0;
 }

tools/supported/position.cpp

@@ -8,8 +8,18 @@ using namespace std;
 
 #include <DFHack.h>
 
-int main (void)
+int main (int argc, char** argv)
 {
+    bool quiet = false;
+    for(int i = 1; i < argc; i++)
+    {
+        string test = argv[i];
+        if(test == "-q")
+        {
+            quiet = true;
+        }
+	}
+	
     DFHack::Position * Position = 0;
     DFHack::ContextManager DFMgr("Memory.xml");
     DFHack::Context * DF;
@@ -50,8 +60,11 @@ int main (void)
     }
     
     #ifndef LINUX_BUILD
+	if(!quiet)
+	{
         cout << "Done. Press any key to continue" << endl;
         cin.ignore();
+	}
     #endif
     return 0;
 }

tools/supported/prospector.cpp

@@ -44,7 +44,7 @@ int main (int argc, const char* argv[])
     
     bool showhidden = false;
     bool showbaselayers = false;
-    for(int i = 0; i < argc; i++)
+    for(int i = 1; i < argc; i++)
     {
         string test = argv[i];
         if(test == "-a")

tools/supported/weather.cpp

@@ -43,8 +43,25 @@ void printWeather(DFHack::WeatherType current)
 }
 
 using namespace DFHack;
-int main (int numargs, const char ** args)
+int main (int argc, char** argv)
 {
+	string command = "";
+    bool quiet = false;
+	bool cmdarg = false;
+    for(int i = 1; i < argc; i++)
+    {
+        string test = argv[i];
+        if(test == "-q")
+        {
+            quiet = true;
+        }
+		else
+		{
+			command = test;
+			cmdarg = true;
+		}
+	}
+	
 	DFHack::ContextManager DFMgr("Memory.xml");
     DFHack::Context *DF = DFMgr.getSingleContext();
 
@@ -68,9 +85,8 @@ int main (int numargs, const char ** args)
     {
         WeatherType current = (WeatherType) W->ReadCurrentWeather();
         DF->Resume();
-        string command = "";
         printWeather(current);
-        getline(cin, command);
+        if (command == "") getline(cin, command); // only read from stdin if command hasn't been passed on the console
         DF->Suspend();
         if(command == "c")
         {
@@ -88,10 +104,15 @@ int main (int numargs, const char ** args)
         {
             end = true;
         }
+        command = "";	
+		if(cmdarg) end = true; // exit the loop when a cmd line arg has been passed.
     }
     #ifndef LINUX_BUILD
+	if (!quiet)
+	{
         std::cout << "Done. Press any key to continue" << std::endl;
         cin.ignore();
+	}
     #endif
     DF->Detach();
     return 0;