Tune caves

[oweals/minetest.git] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
index 4bc22eaa1e08f47682108872b272a7790dc246d4..b95fbd1845ef4f5eae88ba24f4160b587882134f 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -145,11 +145,7 @@ public:
        {
                std::ifstream is(filename);
                if(is.good() == false)
-               {
-                       errorstream<<"Error opening configuration file \""
-                                       <<filename<<"\""<<std::endl;
                        return false;
-               }
 
                infostream<<"Parsing configuration file: \""
                                <<filename<<"\""<<std::endl;
@@ -172,7 +168,8 @@ public:
        */
        bool getUpdatedConfigObject(std::istream &is,
                        core::list<std::string> &dst,
-                       core::map<std::string, bool> &updated)
+                       core::map<std::string, bool> &updated,
+                       bool &value_changed)
        {
                JMutexAutoLock lock(m_mutex);
                
@@ -219,6 +216,7 @@ public:
                                infostream<<"Changing value of \""<<name<<"\" = \""
                                                <<value<<"\" -> \""<<newvalue<<"\""
                                                <<std::endl;
+                               value_changed = true;
                        }
 
                        dst.push_back(name + " = " + newvalue + line_end);
@@ -241,6 +239,7 @@ public:
                
                core::list<std::string> objects;
                core::map<std::string, bool> updated;
+               bool something_actually_changed = false;
                
                // Read and modify stuff
                {
@@ -254,12 +253,34 @@ public:
                        }
                        else
                        {
-                               while(getUpdatedConfigObject(is, objects, updated));
+                               while(getUpdatedConfigObject(is, objects, updated,
+                                               something_actually_changed));
                        }
                }
                
                JMutexAutoLock lock(m_mutex);
                
+               // If something not yet determined to have been changed, check if
+               // any new stuff was added
+               if(!something_actually_changed){
+                       for(core::map<std::string, std::string>::Iterator
+                                       i = m_settings.getIterator();
+                                       i.atEnd() == false; i++)
+                       {
+                               if(updated.find(i.getNode()->getKey()))
+                                       continue;
+                               something_actually_changed = true;
+                               break;
+                       }
+               }
+               
+               // If nothing was actually changed, skip writing the file
+               if(!something_actually_changed){
+                       infostream<<"Skipping writing of "<<filename
+                                       <<" because content wouldn't be modified"<<std::endl;
+                       return true;
+               }
+               
                // Write stuff back
                {
                        std::ofstream os(filename);
@@ -309,6 +330,7 @@ public:
        bool parseCommandLine(int argc, char *argv[],
                        core::map<std::string, ValueSpec> &allowed_options)
        {
+               int nonopt_index = 0;
                int i=1;
                for(;;)
                {
@@ -317,6 +339,15 @@ public:
                        std::string argname = argv[i];
                        if(argname.substr(0, 2) != "--")
                        {
+                               // If option doesn't start with -, read it in as nonoptX
+                               if(argname[0] != '-'){
+                                       std::string name = "nonopt";
+                                       name += itos(nonopt_index);
+                                       set(name, argname);
+                                       nonopt_index++;
+                                       i++;
+                                       continue;
+                               }
                                errorstream<<"Invalid command-line parameter \""
                                                <<argname<<"\": --<option> expected."<<std::endl;
                                return false;
@@ -404,8 +435,6 @@ public:
                        n = m_defaults.find(name);
                        if(n == NULL)
                        {
-                               infostream<<"Settings: Setting not found: \""
-                                               <<name<<"\""<<std::endl;
                                throw SettingNotFoundException("Setting not found");
                        }
                }