more stuff...

master
Perttu Ahola 2011-02-11 20:55:28 +02:00
parent 21372749f5
commit 6e2cd15902
3 changed files with 13 additions and 6 deletions

View File

@ -289,6 +289,7 @@ Doing now (most important at the top):
with the ones in utility.h with the ones in utility.h
=== Stuff to do after release === 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... * Move digging property stuff from material.{h,cpp} to mapnode.cpp...
- Or maybe move content_features to material.{h,cpp}? - Or maybe move content_features to material.{h,cpp}?
* Add some kind of erosion and other stuff that now is possible * Add some kind of erosion and other stuff that now is possible
@ -1542,6 +1543,10 @@ int main(int argc, char *argv[])
break; break;
} }
} }
// If no path found, use the first one (menu creates the file)
if(configpath == "")
configpath = filenames[0];
} }
// Initialize random seed // Initialize random seed

View File

@ -497,8 +497,8 @@ void TextureSource::buildMainAtlas()
/* /*
Write image to file so that it can be inspected Write image to file so that it can be inspected
*/ */
driver->writeImageToFile(atlas_img, /*driver->writeImageToFile(atlas_img,
porting::getDataPath("main_atlas.png").c_str()); porting::getDataPath("main_atlas.png").c_str());*/
} }
video::IImage* generate_image_from_scratch(std::string name, video::IImage* generate_image_from_scratch(std::string name,

View File

@ -970,14 +970,16 @@ public:
std::ifstream is(filename); std::ifstream is(filename);
if(is.good() == false) if(is.good() == false)
{ {
dstream<<"Error opening configuration file" dstream<<"INFO: updateConfigFile():"
" Error opening configuration file"
" for reading: \"" " for reading: \""
<<filename<<"\""<<std::endl; <<filename<<"\""<<std::endl;
return false;
} }
else
{
while(getUpdatedConfigObject(is, objects, updated)); while(getUpdatedConfigObject(is, objects, updated));
} }
}
// Write stuff back // Write stuff back
{ {