From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 11 Feb 2011 18:55:28 +0000 (+0200)
Subject: more stuff...
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=6e2cd159022b7dd438302eee2522b7886eafd8e3;p=zefram%2Fminetest%2Fminetest_engine.git

more stuff...
---

diff --git a/src/main.cpp b/src/main.cpp
index c37a35cd..9aabc674 100644
--- 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
 
 === Stuff to do after release
+* Make an "environment metafile" to store at least time of day
 * Move digging property stuff from material.{h,cpp} to mapnode.cpp...
   - Or maybe move content_features to material.{h,cpp}?
 * Add some kind of erosion and other stuff that now is possible
@@ -1542,6 +1543,10 @@ int main(int argc, char *argv[])
 				break;
 			}
 		}
+		
+		// If no path found, use the first one (menu creates the file)
+		if(configpath == "")
+			configpath = filenames[0];
 	}
 
 	// Initialize random seed
diff --git a/src/tile.cpp b/src/tile.cpp
index 415830a8..13550b2e 100644
--- 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 9e47a5da..b3816c8a 100644
--- 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