more stuff...

diff --git a/src/main.cpp b/src/main.cpp
index c37a35cdb82f7fc7ced47bce9eadd529a3c8927f..9aabc6743125420206d67a1c9990b7507c243aaf 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -289,6 +289,7 @@ Doing now (most important at the top):
   with the ones in utility.h\r
 \r
 === Stuff to do after release\r
+* Make an "environment metafile" to store at least time of day\r
 * Move digging property stuff from material.{h,cpp} to mapnode.cpp...\r
   - Or maybe move content_features to material.{h,cpp}?\r
 * Add some kind of erosion and other stuff that now is possible\r
@@ -1542,6 +1543,10 @@ int main(int argc, char *argv[])
                                break;\r
                        }\r
                }\r
+               \r
+               // If no path found, use the first one (menu creates the file)\r
+               if(configpath == "")\r
+                       configpath = filenames[0];\r
        }\r
 \r
        // Initialize random seed\r

diff --git a/src/tile.cpp b/src/tile.cpp
index 415830a870e3abc3047f6c16da856e669f6d2958..13550b2e4a58a57e34e58548be41bedac84a7881 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -497,8 +497,8 @@ void TextureSource::buildMainAtlas()
        /*
                Write image to file so that it can be inspected
        */
-       driver->writeImageToFile(atlas_img, 
-                       porting::getDataPath("main_atlas.png").c_str());
+       /*driver->writeImageToFile(atlas_img, 
+                       porting::getDataPath("main_atlas.png").c_str());*/
 }
 
 video::IImage* generate_image_from_scratch(std::string name,

diff --git a/src/utility.h b/src/utility.h
index 9e47a5dacbdecbb3083138724392e39838c3d39a..b3816c8a7bd1495dd153018b5a1d8be91fb9eadb 100644 (file)
--- a/src/utility.h
+++ b/src/utility.h
@@ -970,13 +970,15 @@ public:
                        std::ifstream is(filename);
                        if(is.good() == false)
                        {
-                               dstream<<"Error opening configuration file"
+                               dstream<<"INFO: updateConfigFile():"
+                                               " Error opening configuration file"
                                                " for reading: \""
                                                <<filename<<"\""<<std::endl;
-                               return false;
                        }
-
-                       while(getUpdatedConfigObject(is, objects, updated));
+                       else
+                       {
+                               while(getUpdatedConfigObject(is, objects, updated));
+                       }
                }
                
                // Write stuff back