diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-02-11 20:55:28 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-02-11 20:55:28 +0200 |
commit | 6e2cd159022b7dd438302eee2522b7886eafd8e3 (patch) | |
tree | 44c4c54f03c4e0319f5d511b55571eb4bc26cf51 /src | |
parent | 21372749f5700632a0f136f1b1db29bd424bc448 (diff) | |
download | minetest-6e2cd159022b7dd438302eee2522b7886eafd8e3.tar.gz minetest-6e2cd159022b7dd438302eee2522b7886eafd8e3.tar.bz2 minetest-6e2cd159022b7dd438302eee2522b7886eafd8e3.zip |
more stuff...
Diffstat (limited to 'src')
-rw-r--r-- | src/main.cpp | 5 | ||||
-rw-r--r-- | src/tile.cpp | 4 | ||||
-rw-r--r-- | src/utility.h | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp index c37a35cdb..9aabc6743 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 415830a87..13550b2e4 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 9e47a5dac..b3816c8a7 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 |